diff --git a/format-clock-edge-cases/timeConverter.js b/format-clock-edge-cases/timeConverter.js
index 310c07bd9..50881c65f 100644
--- a/format-clock-edge-cases/timeConverter.js
+++ b/format-clock-edge-cases/timeConverter.js
@@ -1,11 +1,14 @@
-function formatAs12HourClock(time) {
+// function receives a string representing time in 24-hour format as an argument
 
+function formatAs12HourClock(time) {
   const hours = Number(time.slice(0, 2));
+  const minutes = time.slice(-2);
+
+  const period = hours >= 12 ? "pm" : "am";
+
+  const displayHour = hours % 12 || 12;
 
-  if (hours > 12) {
-    return `${hours - 12}:00 pm`;
-  }
-  return `${time} am`;
+  return `${displayHour}:${minutes} ${period}`;
 }
 
-export {formatAs12HourClock};
+export { formatAs12HourClock };
diff --git a/format-clock-edge-cases/timeConverter.test.js b/format-clock-edge-cases/timeConverter.test.js
index 88f2af094..a55b4c269 100644
--- a/format-clock-edge-cases/timeConverter.test.js
+++ b/format-clock-edge-cases/timeConverter.test.js
@@ -1,11 +1,30 @@
-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", () =>
+  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", () =>
+  assert.equal(formatAs12HourClock("08:00"), "8:00 am"));
+
+test("can correctly convert midnight", () =>
+  assert.equal(formatAs12HourClock("00:00"), "12:00 am"));
+
+test("noon is pm", () =>
+  assert.equal(formatAs12HourClock("12:00"), "12:00 pm"));
+
+test("noon with minutes", () =>
+  assert.equal(formatAs12HourClock("12:45"), "12:45 pm"));
+
+test("afternoon keeps minutes", () =>
+  assert.equal(formatAs12HourClock("13:30"), "1:30 pm"));
+
+test("evening keeps minutes", () =>
+  assert.equal(formatAs12HourClock("23:15"), "11:15 pm"));
+
+test("midnight with minutes", () =>
+  assert.equal(formatAs12HourClock("00:30"), "12:30 am"));
+
+test("just before noon", () =>
+  assert.equal(formatAs12HourClock("11:59"), "11:59 am"));