diff --git a/app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt b/app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt
index b08dc74..3835355 100644
--- a/app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt
+++ b/app/src/test/java/com/example/hpostesting/HemoCubeFragmentTest.kt
@@ -1,11 +1,7 @@
 package com.example.hpostesting
 
-import android.content.Context
 import android.content.SharedPreferences
 import com.example.hpostesting.presentation.hemocube.HemoCubeFragment
-import com.example.hpostesting.presentation.hemocube.HemocubeActivity
-import `in`.sminnovations.hpostesting.databinding.FragmentHemoCubeReferenceBinding
-import junit.framework.TestCase
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNull
 import org.junit.Before
@@ -17,18 +13,9 @@ import org.mockito.MockitoAnnotations
 
 class HemoCubeFragmentTest {
 
-    @Mock
-    lateinit var mockContext: Context
-
     @Mock
     private lateinit var mockSharedPreferences: SharedPreferences
 
-    @Mock
-    private lateinit var mockActivity: HemocubeActivity // Replace with your actual Activity class
-
-    @Mock
-    private lateinit var mockBinding: FragmentHemoCubeReferenceBinding // Replace with your actual Binding class
-
     private lateinit var hemoCubeFragment: HemoCubeFragment
 
     @Before
@@ -51,7 +38,7 @@ class HemoCubeFragmentTest {
         val deviceId = hemoCubeFragment.extractV2HardwareId("SNS HPP1-9000 SNE")
 
         // Assert
-        TestCase.assertEquals("HPP1-9000", deviceId)
+        assertEquals("HPP1-9000", deviceId)
     }
 
     @Test
@@ -71,7 +58,7 @@ class HemoCubeFragmentTest {
         )
 
         // Assert
-        TestCase.assertEquals("HPP1-0001", deviceId)
+        assertEquals("HPP1-0001", deviceId)
     }
 
     @Test
@@ -84,8 +71,8 @@ class HemoCubeFragmentTest {
         val result = hemoCubeFragment.allReadingsComplete(repeatReadingCount, readingsPerSample)
 
         // Assert
-        TestCase.assertEquals(true, result)
-        TestCase.assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
+        assertEquals(true, result)
+        assertEquals(hemoCubeFragment.allReadingsComplete(0, 1), false)
     }
 
     @Test
@@ -381,64 +368,75 @@ class HemoCubeFragmentTest {
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineNormal() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.5)
+        val result =
+            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.5)
         assertEquals("Borderline. Normal", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait1() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
+        val result =
+            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline", 2.2)
         assertEquals("Borderline. Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellTrait2() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Positive for Sickle Cell. HPLC for Confirmation", 1.35)
+        val result = hemoCubeFragment.findResultWithAdditionalMethods(
+            0.5,
+            "Positive for Sickle Cell. HPLC for Confirmation",
+            1.35
+        )
         assertEquals("Borderline. Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_ValidInput_ReturnsBorderlineSickleCellDisease() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Positive for Sickle Cell. HPLC for Confirmation", 1.33)
+        val result = hemoCubeFragment.findResultWithAdditionalMethods(
+            0.5,
+            "Positive for Sickle Cell. HPLC for Confirmation",
+            1.33
+        )
         assertEquals("Borderline. Sickle Cell Disease", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_NormalDeviceRatio_ReturnsNormalBelowSlopeRatioThreshold() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 70.0)).thenReturn("Negative Borderline, Repeat Test")
         val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Normal", 30.0)
         assertEquals("Normal", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_NBL_ReturnsNBL() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Negative Borderline, Repeat Test", 70.0)
+        val result = hemoCubeFragment.findResultWithAdditionalMethods(
+            0.5,
+            "Negative Borderline, Repeat Test",
+            70.0
+        )
         assertEquals("Negative Borderline, Repeat Test", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_SCT_ReturnsSCT() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
+        val result =
+            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Trait", 70.0)
         assertEquals("Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_PBL_ReturnsPBL() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Positive for Sickle Cell. HPLC for Confirmation", 1.35)
+        val result = hemoCubeFragment.findResultWithAdditionalMethods(
+            0.5,
+            "Positive for Sickle Cell. HPLC for Confirmation",
+            1.35
+        )
         assertEquals("Borderline. Sickle Cell Trait", result)
     }
 
     @Test
     fun findResultWithAdditionalMethods_SCD_ReturnsSCD() {
-//        `when`(hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Abnormal", 70.0)).thenReturn("Invalid")
-        val result = hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
+        val result =
+            hemoCubeFragment.findResultWithAdditionalMethods(0.5, "Sickle Cell Disease", 70.0)
         assertEquals("Sickle Cell Disease", result)
     }
 
@@ -450,7 +448,11 @@ class HemoCubeFragmentTest {
         val led2Average = 0.2
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioClass, led2Average)
+        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+            deviceRatio,
+            deviceRatioClass,
+            led2Average
+        )
 
         // Assert
         assertEquals("Borderline. Normal", result)
@@ -464,7 +466,11 @@ class HemoCubeFragmentTest {
         val led2Average = 0.14
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioClass, led2Average)
+        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+            deviceRatio,
+            deviceRatioClass,
+            led2Average
+        )
 
         // Assert
         assertEquals("Borderline. Sickle Cell Trait", result)
@@ -478,7 +484,11 @@ class HemoCubeFragmentTest {
         val led2Average = 0.18
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioClass, led2Average)
+        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+            deviceRatio,
+            deviceRatioClass,
+            led2Average
+        )
 
         // Assert
         assertEquals("Borderline. Sickle Cell Disease", result)
@@ -492,7 +502,11 @@ class HemoCubeFragmentTest {
         val led2Average = 0.195
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioClass, led2Average)
+        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+            deviceRatio,
+            deviceRatioClass,
+            led2Average
+        )
 
         // Assert
         assertEquals("Borderline. Sickle Cell Trait", result)
@@ -506,7 +520,11 @@ class HemoCubeFragmentTest {
         val led2Average = 0.189
 
         // Act
-        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(deviceRatio, deviceRatioClass, led2Average)
+        val result = hemoCubeFragment.reclassifyWithBorderlineMethod2(
+            deviceRatio,
+            deviceRatioClass,
+            led2Average
+        )
 
         // Assert
         assertEquals("Borderline. Sickle Cell Disease", result)