diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9..fe88de4af 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,17 @@
 function formatAs12HourClock(time) {
-
   const hours = Number(time.slice(0, 2));
+  const minutes = time.slice(3, 5);
 
+  if (hours === 0) {
+    return `12:${minutes} am`;
+  }
+  if (hours === 12) {
+    return `12:${minutes} pm`;
+  }
   if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+    return `${String(hours - 12).padStart(2, "0")}:${minutes} pm`;
   }
   return `${time} 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..c6ae7f08c 100644
--- a/format-clock-edge-cases/timeConverter.test.js
+++ b/format-clock-edge-cases/timeConverter.test.js
@@ -1,11 +1,23 @@
-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 correctly convert morning time", function () {
+  assert.equal(formatAs12HourClock("08:00"), "08:00 am");
+});
+test("can correctly convert midnight time", function () {
+  assert.equal(formatAs12HourClock("00:00"), "12:00 am");
+});
+test("can correctly convert noon time", function () {
+  assert.equal(formatAs12HourClock("12:00"), "12:00 pm");
+});
+test("can correctly convert a few mins after midnight ", function () {
+  assert.equal(formatAs12HourClock("00:05"), "12:05 am");
+});
+test("can correctly convert a few mins after noon ", function () {
+  assert.equal(formatAs12HourClock("12:05"), "12:05 pm");
 });