diff --git a/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt b/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt
index f21b6d6..90ceb62 100644
--- a/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt
+++ b/app/src/main/java/com/example/hpos/data/model/TestRightCalculationData.kt
@@ -9,4 +9,6 @@ data class TestRightCalculationData(
     var ratioMaxRange: Double?,
     var ratioValue: Double?,
     var result: TestRightResultType
-)
\ No newline at end of file
+) {
+    constructor() : this(null, null, null, null, null, null, null, TestRightResultType.UNDEFINED)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt
index 1595947..2e4e5d4 100644
--- a/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt
+++ b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithAvgImpl.kt
@@ -6,16 +6,7 @@ import com.example.hpos.data.model.TestRightResultType
 
 class ResultCalculationWithAvgImpl : TestRightResultCalculation {
 
-    val testRightCalculationData = TestRightCalculationData(
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        TestRightResultType.UNDEFINED
-    )
+    private val testRightCalculationData = TestRightCalculationData()
 
     override fun getResults(wavelengthToAbsorbance: ArrayList<ArrayList<Double>>): TestRightCalculationData {
 
diff --git a/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt
index 6d6f39a..751d0b0 100644
--- a/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt
+++ b/app/src/main/java/com/example/hpos/domain/ResultCalculationWithMaxImpl.kt
@@ -6,16 +6,7 @@ import com.example.hpos.data.model.TestRightResultType
 
 class ResultCalculationWithMaxImpl : TestRightResultCalculation {
 
-    val testRightCalculationData = TestRightCalculationData(
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        null,
-        TestRightResultType.UNDEFINED
-    )
+    val testRightCalculationData = TestRightCalculationData()
 
     override fun getResults(wavelengthToAbsorbance: ArrayList<ArrayList<Double>>): TestRightCalculationData {