diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9..2908702c5 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,18 @@
 function formatAs12HourClock(time) {
-
   const hours = Number(time.slice(0, 2));
+  const slicedMinutes = time.slice(-2);
 
-  if (hours > 12) {
-    return `${hours - 12}:00 pm`;
+  if (hours === 0) {
+    return `12:${slicedMinutes} am`;
+  } else if (hours > 1 && hours <= 11) {
+    return `0${hours}:${slicedMinutes} am`;
+  } else if (hours === 12) {
+    return `12:${slicedMinutes} pm`;
+  } else if (hours > 12 && hours <= 21) {
+    return `0${hours - 12}:${slicedMinutes} pm`;
+  } else if (hours === 22 || hours === 23) {
+    return `${hours - 12}:${slicedMinutes} 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..d9f588a6a 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("14:00"), "02: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 midday time", function () {
+  assert.equal(formatAs12HourClock("12:00"), "12:00 pm");
+});
+
+test("can correctly convert 22:00 and 23:00 time", function () {
+  assert.equal(formatAs12HourClock("22:00"), "10:00 pm");
 });