diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js
index cf50f6cad..120f89060 100644
--- a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js
+++ b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js
@@ -10,3 +10,19 @@ test("Classifies right angles", () => {
   const right = getAngleType(90);
   assert.equal(right, "Right angle");
 });
+test("Classifies acute angles", () =>
+  assert.equal(getAngleType(89), "Acute angle"));
+test("Classifies obtuse angle", () =>
+  assert.equal(getAngleType(130), "Obtuse angle"));
+test("Classifies straight angle", () =>
+  assert.equal(getAngleType(180), "Straight angle"));
+test("Classifies reflex angle", () =>
+  assert.equal(getAngleType(240), "Reflex angle"));
+test("Classifies zero angle", () =>
+  assert.equal(getAngleType(0), "Zero angle"));
+test("Classifies full angle", () =>
+  assert.equal(getAngleType(360), "Full angle"));
+test("Classifies invalid angle range", () =>
+  assert.equal(getAngleType(-120), "Invalid angle"));
+test("Classifies invalid angle range", () =>
+  assert.equal(getAngleType(450), "Invalid angle"));
diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js
index a29084605..f7fbe9add 100644
--- a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js
+++ b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js
@@ -8,5 +8,14 @@ import { isProperFraction } from "../implement/2-is-proper-fraction.js";
 
 test("Basic proper fraction", () => {
   // Example: 1/2 is a proper fraction
-  assert.equal(isProperFraction(1, 2), true);
+  assert.equal(isProperFraction(1, -2), true);
+});
+test("Basic improper fraction", () => {
+  assert.equal(isProperFraction(5, 3), false);
+});
+test("When numerator and denominator are equal", function () {
+  assert.equal(isProperFraction(7, 7), false);
+});
+test("when denominator is zero", () => {
+  assert.equal(isProperFraction(5, 0), NaN);
 });
diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js
index f5092d9b1..1634c83e0 100644
--- a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js
+++ b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js
@@ -10,7 +10,17 @@ test("Valid single-digit card", () => {
 });
 
 test("Arbitrary non-card string", () => {
-  assert.throws(() => getCardValue("invalid"), /Expected a number followed by a suit, but got "invalid"/, "Expected clear error");
+  assert.throws(
+    () => getCardValue("H♠"),
+    /Expected a number followed by a suit, but got "invalid"/,
+    "Expected clear error"
+  );
+});
+test("Valid face card", function () {
+  assert.equal(getCardValue("J♣"), 10);
+});
+test("Valid ace card", function () {
+  assert.equal(getCardValue("A♠"), 11);
 });
 
 // TODO: What other invalid card cases can you think of?
diff --git a/implement-and-rewrite-tests/implement/1-get-angle-type.js b/implement-and-rewrite-tests/implement/1-get-angle-type.js
index 8a6fba050..dc595d48c 100644
--- a/implement-and-rewrite-tests/implement/1-get-angle-type.js
+++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js
@@ -18,4 +18,22 @@
 
 export function getAngleType(angle) {
   // TODO: Implement this function
+  switch (true) {
+    case angle === 90:
+      return "Right angle";
+    case angle > 0 && angle < 90:
+      return "Acute angle";
+    case angle > 90 && angle < 180:
+      return "Obtuse angle";
+    case angle === 180:
+      return "Straight angle";
+    case angle > 180 && angle < 360:
+      return "Reflex angle";
+    case angle === 0:
+      return "Zero angle";
+    case angle === 360:
+      return "Full angle";
+    default:
+      return "Invalid angle";
+  }
 }
diff --git a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js
index f983800f0..6f74de0f6 100644
--- a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js
+++ b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js
@@ -15,4 +15,12 @@
 
 export function isProperFraction(numerator, denominator) {
   // TODO: Implement this function
+  switch (true) {
+    case denominator === 0:
+      return NaN;
+    case Math.abs(numerator) < Math.abs(denominator):
+      return true;
+    case Math.abs(numerator) >= Math.abs(denominator):
+      return false;
+  }
 }
diff --git a/implement-and-rewrite-tests/implement/3-get-card-value.js b/implement-and-rewrite-tests/implement/3-get-card-value.js
index 9614ab1ee..f88a47b5f 100644
--- a/implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -25,4 +25,16 @@
 
 export function getCardValue(card) {
   // TODO: Implement this function
+  const format = /^([AJQK]|[2-9]|10)[♠♥♦♣]$/;
+  if (typeof card === "string" && format.test(card)) {
+    switch (true) {
+      case parseInt(card) >= 2 && parseInt(card) <= 10:
+        return parseInt(card);
+      case card[0] === "K" || card[0] === "Q" || card[0] === "J":
+        return 10;
+      case card[0] === "A":
+        return 11;
+    }
+  }
+  throw new Error('Expected a number followed by a suit, but got "invalid"');
 }
diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
index e0ba786ab..db883af1c 100644
--- a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
+++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
@@ -12,7 +12,35 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => {
 });
 
 // Case 2: Right angle
+test(`should return "Right angle" when (angle === 90)`, () => {
+  expect(getAngleType(90)).toEqual("Right angle");
+});
 // Case 3: Obtuse angles
+test(`should return "Obtuse angle" when (90 < angle < 180)`, () => {
+  expect(getAngleType(91)).toEqual("Obtuse angle");
+  expect(getAngleType(120)).toEqual("Obtuse angle");
+  expect(getAngleType(179)).toEqual("Obtuse angle");
+});
 // Case 4: Straight angle
+test(`should return "Straight angle" when (angle === 180)`, () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
 // Case 5: Reflex angles
-// Case 6: Invalid angles
+test(`should return "Reflex angle" when (180 < angle < 360)`, () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+  expect(getAngleType(260)).toEqual("Reflex angle");
+  expect(getAngleType(359)).toEqual("Reflex angle");
+});
+//Case 6: Full angle
+test(`should return "Full angle" when (angle === 360)`, () => {
+  expect(getAngleType(360)).toEqual("Full angle");
+});
+// Case 7: Zero angle
+test(`should return "Zero angle" when (angle === 0)`, () => {
+  expect(getAngleType(0)).toEqual("Zero angle");
+});
+// Case 8: Invalid angles
+test(`should return "Invalid angle" when (angle < 0 or angle > 360)`, () => {
+  expect(getAngleType(400)).toEqual("Invalid angle");
+  expect(getAngleType(-12)).toEqual("Invalid angle");
+});
diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
index 5d49e2d8b..1ac65f4de 100644
--- a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
+++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
@@ -4,5 +4,12 @@ import { isProperFraction } from "../implement/2-is-proper-fraction.js";
 
 // Special case: numerator is zero
 test(`should return false when denominator is zero`, () => {
-  expect(isProperFraction(1, 0)).toEqual(false);
+  expect(isProperFraction(1, 0)).toEqual(NaN);
+});
+test(`should return false when (nominator >= denominator)`, () => {
+  expect(isProperFraction(4, 1)).toEqual(false);
+  expect(isProperFraction(3, 3)).toEqual(false);
+});
+test(`should return true when (nominator < denominator)`, () => {
+  expect(isProperFraction(3, 5)).toEqual(true);
 });
diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
index a6de5a82a..ebaad1365 100644
--- a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
+++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
@@ -6,6 +6,26 @@ import { getCardValue } from "../implement/3-get-card-value.js";
 test(`Should return 11 when given an ace card`, () => {
   expect(getCardValue("A♠")).toEqual(11);
 });
+// Case 2: number cards (2-10)
+test(`Should return the digit when given number card`, () => {
+  expect(getCardValue("10♠")).toEqual(10);
+  expect(getCardValue("6♠")).toEqual(6);
+  expect(getCardValue("2♠")).toEqual(2);
+});
+// Case 3: face cards
+test(`Should return 10 when given face card`, () => {
+  expect(getCardValue("J♣")).toEqual(10);
+  expect(getCardValue("Q♠")).toEqual(10);
+  expect(getCardValue("K♦")).toEqual(10);
+});
+// Case 4: invalid cards
+test(`Should return invalid when given invalid card`, () => {
+  expect(() => {
+    getCardValue("L♣").toThrow("invalid");
+    getCardValue("A*").toThrow("invalid");
+    getCardValue("12♣").toThrow("invalid");
+  });
+});
 
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
@@ -15,4 +35,3 @@ test(`Should return 11 when given an ace card`, () => {
 // To learn how to test whether a function throws an error as expected in Jest,
 // please refer to the Jest documentation:
 // https://jestjs.io/docs/expect#tothrowerror
-