diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9..42a7d0e55 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,27 @@
 function formatAs12HourClock(time) {
-
   const hours = Number(time.slice(0, 2));
+  const minutes = time.slice(3, 5);
 
   if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+    const time = hours - 12;
+
+    if (time < 10) {
+      return `0${time}:${minutes} pm`;
+    }
+    return `${hours - 12}:${minutes} pm`;
+  }
+  if (hours === 0) {
+    return `12:${minutes} am`;
+  }
+  if (hours === 12) {
+    return `12:${minutes} pm`;
   }
-  return `${time} am`;
+
+  if (hours < 10) {
+    return `0${hours}:${minutes} am`;
+  }
+
+  return `${time}: ${minutes} am`;
 }
 
-export {formatAs12HourClock};
+export { formatAs12HourClock };
diff --git a/format-clock-edge-cases/timeConverter.test.js b/format-clock-edge-cases/timeConverter.test.js
index 88f2af094..3b08333f4 100644
--- a/format-clock-edge-cases/timeConverter.test.js
+++ b/format-clock-edge-cases/timeConverter.test.js
@@ -1,11 +1,35 @@
-import {formatAs12HourClock} from "./timeConverter.js";
+import { formatAs12HourClock } from "./timeConverter.js";
 import assert from "node:assert";
 import test from "node:test";
 
-test("correctly convert time after 12:00", function(){
-    assert.equal(formatAs12HourClock("23:00"), "11:00 pm");
+test("correctly convert time after 12:00", function () {
+  assert.equal(formatAs12HourClock("23:00"), "11:00 pm");
 });
 
-test("can correctly convert morning time", function() {
-    assert.equal(formatAs12HourClock("08:00"), "08:00 am");
+test("can convert morning time from 08:00 to 08:00 am", function () {
+  assert.equal(formatAs12HourClock("08:00"), "08:00 am");
+});
+
+test("correctly convert time after 12:00 ", function () {
+  assert.equal(formatAs12HourClock("14:00"), "02:00 pm");
+});
+
+test("correctly convert time after 12:00 ", function () {
+  assert.equal(formatAs12HourClock("21:00"), "09:00 pm");
+});
+
+test("correctly convert time after 12:00 ", function () {
+  assert.equal(formatAs12HourClock("16:00"), "04:00 pm");
+});
+
+test("correctly convert time after 12:00 ", function () {
+  assert.equal(formatAs12HourClock("19:00"), "07:00 pm");
+});
+
+test("converts 23:59 to 11:59 ", function () {
+  assert.equal(formatAs12HourClock("23:59"), "11:59 pm");
+});
+
+test("converts 12:01 to 12:01 ", function () {
+  assert.equal(formatAs12HourClock("12:01"), "12:01 pm");
 });