diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
index 9e05a871e2..2b17554726 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js
@@ -1,37 +1,65 @@
-// Implement a function getAngleType
-//
-// When given an angle in degrees, it should return a string indicating the type of angle:
-// - "Acute angle" for angles greater than 0° and less than 90°
-// - "Right angle" for exactly 90°
-// - "Obtuse angle" for angles greater than 90° and less than 180°
-// - "Straight angle" for exactly 180°
-// - "Reflex angle" for angles greater than 180° and less than 360°
-// - "Invalid angle" for angles outside the valid range.
-
-// Assumption: The parameter is a valid number. (You do not need to handle non-numeric inputs.)
-
-// Acceptance criteria:
-// After you have implemented the function, write tests to cover all the cases, and
-// execute the code to ensure all tests pass.
 
 function getAngleType(angle) {
-  // TODO: Implement this function
+  if (angle <= 0 || angle >= 360) {
+    return "Invalid angle";
+  }
+  else if (angle == 90) {
+    return "Right angle";
+  }
+  else if (angle == 180) {
+    return "Straight angle";
+  }
+  else if (angle > 0 && angle < 90) {
+    return "Acute angle";
+  }
+  else if (angle > 90 && angle < 180) {
+    return "Obtuse angle";
+  }
+  else 
+    return "Reflex angle";
 }
 
-// The line below allows us to load the getAngleType function into tests in other files.
-// This will be useful in the "rewrite tests with jest" step.
-module.exports = getAngleType;
-
-// This helper function is written to make our assertions easier to read.
-// If the actual output matches the target output, the test will pass
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
     actualOutput === targetOutput,
     `Expected ${actualOutput} to equal ${targetOutput}`
   );
 }
+const invalid = getAngleType(0);
+assertEquals(invalid, "Invalid angle");
+console.log (getAngleType(0));
+
+const invalid0 = getAngleType(-10);
+assertEquals(invalid, "Invalid angle");
+console.log (getAngleType(-10));
+
+const invalid1 = getAngleType(360);
+assertEquals(invalid1, "Invalid angle");
+console.log (getAngleType(360));
+
+const invalid2 = getAngleType(900);
+assertEquals(invalid2, "Invalid angle");
+console.log (getAngleType(900));
 
-// TODO: Write tests to cover all cases, including boundary and invalid cases.
-// Example: Identify Right Angles
 const right = getAngleType(90);
 assertEquals(right, "Right angle");
+console.log (getAngleType(90));
+
+const straight = getAngleType(180);
+assertEquals(straight, "Straight angle");
+console.log (getAngleType(180));
+
+const acute = getAngleType(45);
+assertEquals(acute, "Acute angle");
+console.log (getAngleType(45));
+
+const obtuse = getAngleType(135);
+assertEquals(obtuse, "Obtuse angle");
+console.log (getAngleType(135));
+
+const reflex = getAngleType(240);
+assertEquals(reflex, "Reflex angle");
+console.log (getAngleType(240));
+
+module.exports = getAngleType;
+
diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
index 970cb9b641..b9b91dd655 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js
@@ -11,14 +11,15 @@
 // execute the code to ensure all tests pass.
 
 function isProperFraction(numerator, denominator) {
-  // TODO: Implement this function
-}
-
-// The line below allows us to load the isProperFraction function into tests in other files.
-// This will be useful in the "rewrite tests with jest" step.
-module.exports = isProperFraction;
+  if (denominator === 0) {
+    return false;
+  }
+  else if (numerator >= 0 && denominator !== 0) {
 
-// Here's our helper again
+  return Math.abs(numerator) < Math.abs(denominator);
+  }
+}
+  
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
     actualOutput === targetOutput,
@@ -26,8 +27,43 @@ function assertEquals(actualOutput, targetOutput) {
   );
 }
 
+const case1 = isProperFraction(1, 2);
+assertEquals(case1, true);
+console.log(isProperFraction(1, 2));
+
+const case2 = isProperFraction(3, 4);
+assertEquals(case2, true);
+console.log(isProperFraction(3, 4));
+
+const case3 = isProperFraction(4, 4);
+assertEquals(case3, false);
+console.log(isProperFraction(4, 4));
+
+const case4 = isProperFraction(8, 5);
+assertEquals(case4, false);
+console.log(isProperFraction(8, 5));
+
+const case5 = isProperFraction(16, 22);
+assertEquals(case5, true);
+console.log(isProperFraction(16, 22));
+
+const case6 = isProperFraction(0, 6);
+assertEquals(case6, true);
+console.log(isProperFraction(0, 6));
+
+const case7 = isProperFraction(5, 0);
+assertEquals(case7, false);
+console.log(isProperFraction(5, 0));
+
+module.exports = isProperFraction;
+
+// The line below allows us to load the isProperFraction function into tests in other files.
+// This will be useful in the "rewrite tests with jest" step.
+
+
+// Here's our helper again
 // TODO: Write tests to cover all cases.
 // What combinations of numerators and denominators should you test?
 
 // Example: 1/2 is a proper fraction
-assertEquals(isProperFraction(1, 2), true);
+// assertEquals(isProperFraction(1, 2), true);
\ No newline at end of file
diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
index ff5c532e1d..e2cbe07026 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js
@@ -22,14 +22,37 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
-  // TODO: Implement this function
-}
+  const rank = card.slice(0, -1);
+  const suit = card.slice(-1);
 
-// The line below allows us to load the getCardValue function into tests in other files.
-// This will be useful in the "rewrite tests with jest" step.
-module.exports = getCardValue;
+  const validRank = [
+    "A",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "10",
+    "J",
+    "Q",
+    "K",
+  ];
+  const validSuit = ["♠", "♥", "♦", "♣"];
+
+  if (!validRank.includes(rank) || !validSuit.includes(suit)) {
+    throw new Error("Invalid Card");
+  }
+
+  if (rank === "A") {
+    return 11;
+  } else if (rank === "J" || rank === "Q" || rank === "K") {
+    return 10;
+  } else return Number(rank);
+}
 
-// Helper functions to make our assertions easier to read.
 function assertEquals(actualOutput, targetOutput) {
   console.assert(
     actualOutput === targetOutput,
@@ -37,18 +60,88 @@ function assertEquals(actualOutput, targetOutput) {
   );
 }
 
-// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
-// Examples:
-assertEquals(getCardValue("9♠"), 9);
+const ace = getCardValue("A♠");
+assertEquals(getCardValue("A♠"), 11);
+console.log(getCardValue("A♠"));
+
+const faceJ = getCardValue("J♣");
+assertEquals(getCardValue("J♣"), 10);
+console.log(getCardValue("J♣"));
+
+const faceQ = getCardValue("Q♦");
+assertEquals(getCardValue("Q♦"), 10);
+console.log(getCardValue("Q♦"));
+
+const faceK = getCardValue("K♦");
+assertEquals(getCardValue("K♦"), 10);
+console.log(getCardValue("K♦"));
+
+const number5 = getCardValue("5♥");
+assertEquals(getCardValue("5♥"), 5);
+console.log(getCardValue("5♥"));
+
+const number10 = getCardValue("10♥");
+assertEquals(getCardValue("10♥"), 10);
+console.log(getCardValue("10♥"));
+
+try {
+  getCardValue("10");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+
+try {
+  getCardValue("A");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
 
-// Handling invalid cards
 try {
-  getCardValue("invalid");
+  getCardValue("10x");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
 
-  // This line will not be reached if an error is thrown as expected
+try {
+  getCardValue("JK");
   console.error("Error was not thrown for invalid card 😢");
 } catch (e) {
   console.log("Error thrown for invalid card 🎉");
 }
 
-// What other invalid card cases can you think of?
+try {
+  getCardValue("Qxx");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+try {
+  getCardValue("*");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+try {
+  getCardValue("diamonds");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+try {
+  getCardValue("♤");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+try {
+  getCardValue("x");
+  console.error("Error was not thrown for invalid card 😢");
+} catch (e) {
+  console.log("Error thrown for invalid card 🎉");
+}
+
+
+module.exports = getCardValue;
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
index d777f348d3..b87567d6ce 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js
@@ -1,20 +1,28 @@
-// This statement loads the getAngleType function you wrote in the implement directory.
-// We will use the same function, but write tests for it using Jest in this file.
 const getAngleType = require("../implement/1-get-angle-type");
 
-// TODO: Write tests in Jest syntax to cover all cases/outcomes,
-// including boundary and invalid cases.
-
-// Case 1: Acute angles
 test(`should return "Acute angle" when (0 < angle < 90)`, () => {
-  // Test various acute angles, including boundary cases
   expect(getAngleType(1)).toEqual("Acute angle");
   expect(getAngleType(45)).toEqual("Acute angle");
   expect(getAngleType(89)).toEqual("Acute angle");
 });
+test(`should return "Right angle" when (angle == 90)`, () => {
+  expect(getAngleType(90)).toEqual("Right angle");
+});
+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");
+});
+test(`should return "Straight angle" when (angle == 180)`, () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
+test(`should return "Reflex angle" when (180 < angle < 360)`, () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+  expect(getAngleType(270)).toEqual("Reflex angle");
+  expect(getAngleType(359)).toEqual("Reflex angle");
+});
+test(`should return "Invalid angle" when (angle <= 0 || angle >= 360)`, () => {
+  expect(getAngleType(-1)).toEqual("Invalid angle");
+  expect(getAngleType(370)).toEqual("Invalid angle");
+});
 
-// Case 2: Right angle
-// Case 3: Obtuse angles
-// Case 4: Straight angle
-// Case 5: Reflex angles
-// Case 6: Invalid angles
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
index 7f087b2ba1..f449e2e691 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js
@@ -8,3 +8,21 @@ const isProperFraction = require("../implement/2-is-proper-fraction");
 test(`should return false when denominator is zero`, () => {
   expect(isProperFraction(1, 0)).toEqual(false);
 });
+test(`should return true when the function is proper fraction`, () => {
+  expect(isProperFraction(1, 2)).toEqual(true);
+});
+test(`should return false when the function is improper fraction`, () => {
+  expect(isProperFraction(8, 5)).toEqual(false);
+});
+test(`should return false when the numerator is equal to denominator`, () => {
+  expect(isProperFraction(4, 4)).toEqual(false);
+});
+test(`should return true when numerator is zero`, () => {
+  expect(isProperFraction(0, 1)).toEqual(true);
+});
+test(`should return false when numerator is negative`, () => {
+  expect(isProperFraction(-1, 1)).toEqual(false);
+});
+test(`should return false when denominator is negative`, () => {
+  expect(isProperFraction(1, -1)).toEqual(false);
+});
\ No newline at end of file
diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
index cf7f9dae2e..b0e2cad4dd 100644
--- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
+++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js
@@ -1,20 +1,70 @@
-// This statement loads the getCardValue function you wrote in the implement directory.
-// We will use the same function, but write tests for it using Jest in this file.
 const getCardValue = require("../implement/3-get-card-value");
-
-// TODO: Write tests in Jest syntax to cover all possible outcomes.
-
-// Case 1: Ace (A)
 test(`Should return 11 when given an ace card`, () => {
   expect(getCardValue("A♠")).toEqual(11);
 });
-
-// Suggestion: Group the remaining test data into these categories:
-//   Number Cards (2-10)
-//   Face Cards (J, Q, K)
-//   Invalid Cards
-
-// 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
-
+describe("Number Cards", () => {
+  test(`Should return 5 for 5♥`, () => {
+    expect(getCardValue("5♥")).toEqual(5);
+  });
+  test(`Should return 10 for 10♥`, () => {
+    expect(getCardValue("10♥")).toEqual(10);
+  });
+});
+describe("Face Cards", () => {
+  test(`Should return 10 for J♣`, () => {
+    expect(getCardValue("J♣")).toEqual(10);
+  });
+  test(`Should return 10 for Q♦`, () => {
+    expect(getCardValue("Q♦")).toEqual(10);
+  });
+  test(`Should return 10 for K♦`, () => {
+    expect(getCardValue("K♦")).toEqual(10);
+  });
+});
+describe("Invalid Cards", () => {
+  test("throws error for invalid card", () => {
+    expect(() => {
+      getCardValue("10");
+    }).toThrow();
+  });
+  test("throws error for invalid card", () => {
+    expect(() => {
+      getCardValue("A");
+    }).toThrow();
+  });
+  test("throws error for invalid card", () => {
+    expect(() => {
+      getCardValue("10x");
+    }).toThrow();
+  });
+  test("throws error for invalid card", () => {
+    expect(() => {
+      getCardValue("JK");
+    }).toThrow();
+  });
+  test("throws error for invalid card", () => {
+    expect(() => {
+      getCardValue("Qxx");
+    }).toThrow();
+  });
+    test("throws error for invalid suit", () => {
+    expect(() => {
+      getCardValue("*");
+    }).toThrow();
+  });
+    test("throws error for invalid suit", () => {
+    expect(() => {
+      getCardValue("diamonds");
+    }).toThrow();
+  });
+    test("throws error for invalid suit", () => {
+    expect(() => {
+      getCardValue("♤");
+    }).toThrow();
+  });
+      test("throws error for invalid suit", () => {
+    expect(() => {
+      getCardValue("x");
+    }).toThrow();
+  });
+});