diff --git a/src/test/kotlin/usecase/SurgicalProcessData.kt b/src/test/kotlin/data/SurgicalProcessData.kt
similarity index 85%
rename from src/test/kotlin/usecase/SurgicalProcessData.kt
rename to src/test/kotlin/data/SurgicalProcessData.kt
index b816f0b..a4f8850 100644
--- a/src/test/kotlin/usecase/SurgicalProcessData.kt
+++ b/src/test/kotlin/data/SurgicalProcessData.kt
@@ -6,7 +6,7 @@
  * https://opensource.org/licenses/MIT.
  */
 
-package usecase
+package data
 
 import entity.healthcareuser.PatientID
 import entity.healthcareuser.PatientVitalSigns
@@ -29,8 +29,8 @@ import java.time.Instant
  * Module that wraps some data about simple surgical processes.
  */
 object SurgicalProcessData {
-    val listOfPatientVitalSigns = listOf(
-        PatientVitalSigns(
+    val listOfTimedPatientVitalSigns = listOf(
+        Instant.parse("2020-10-03T08:10:50Z") to PatientVitalSigns(
             VitalSign.HeartBeat(60),
             VitalSign.DiastolicBloodPressure(100),
             VitalSign.SystolicBloodPressure(80),
@@ -38,7 +38,7 @@ object SurgicalProcessData {
             VitalSign.SaturationPercentage(Percentage(85.0)),
             VitalSign.BodyTemperature(Temperature(36.0)),
         ),
-        PatientVitalSigns(
+        Instant.parse("2020-10-03T08:17:55Z") to PatientVitalSigns(
             VitalSign.HeartBeat(50),
             VitalSign.DiastolicBloodPressure(150),
             VitalSign.SystolicBloodPressure(100),
@@ -46,7 +46,7 @@ object SurgicalProcessData {
             VitalSign.SaturationPercentage(Percentage(40.0)),
             VitalSign.BodyTemperature(Temperature(37.0)),
         ),
-        PatientVitalSigns(
+        Instant.parse("2020-10-03T08:19:00Z") to PatientVitalSigns(
             VitalSign.HeartBeat(100),
             VitalSign.DiastolicBloodPressure(115),
             VitalSign.SystolicBloodPressure(87),
@@ -56,20 +56,22 @@ object SurgicalProcessData {
         ),
     )
 
-    val listOfRoomEnvironmentalData = listOf(
-        RoomEnvironmentalData(
+    val listOfPatientVitalSigns = listOfTimedPatientVitalSigns.map { it.second }
+
+    val listOfTimedRoomEnvironmentalData = listOf(
+        Instant.parse("2020-10-03T08:11:50Z") to RoomEnvironmentalData(
             Temperature(30.0),
             Humidity(Percentage(50.0)),
             Luminosity(100.0),
             Presence(false),
         ),
-        RoomEnvironmentalData(
+        Instant.parse("2020-10-03T08:16:55Z") to RoomEnvironmentalData(
             Temperature(35.0),
             Humidity(Percentage(55.0)),
             Luminosity(150.0),
             Presence(true),
         ),
-        RoomEnvironmentalData(
+        Instant.parse("2020-10-03T08:25:00Z") to RoomEnvironmentalData(
             Temperature(32.0),
             Humidity(Percentage(80.0)),
             Luminosity(300.0),
@@ -77,6 +79,8 @@ object SurgicalProcessData {
         ),
     )
 
+    val listOfRoomEnvironmentalData = listOfTimedRoomEnvironmentalData.map { it.second }
+
     val simpleSurgicalProcess = SurgicalProcess(
         SurgicalProcessID("process"),
         "description",
diff --git a/src/test/kotlin/usecase/GetSurgicalProcessStartEndDateTimeTest.kt b/src/test/kotlin/usecase/GetSurgicalProcessStartEndDateTimeTest.kt
index ccadc10..463c53a 100644
--- a/src/test/kotlin/usecase/GetSurgicalProcessStartEndDateTimeTest.kt
+++ b/src/test/kotlin/usecase/GetSurgicalProcessStartEndDateTimeTest.kt
@@ -10,8 +10,8 @@ package usecase
 
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
-import usecase.SurgicalProcessData.simpleSurgicalProcess
-import usecase.SurgicalProcessData.simpleSurgicalProcessInterrupted
+import data.SurgicalProcessData.simpleSurgicalProcess
+import data.SurgicalProcessData.simpleSurgicalProcessInterrupted
 import java.time.Instant
 
 class GetSurgicalProcessStartEndDateTimeTest : StringSpec({
diff --git a/src/test/kotlin/usecase/ReportGenerationUseCaseTest.kt b/src/test/kotlin/usecase/ReportGenerationUseCaseTest.kt
index c32b820..ebd2d21 100644
--- a/src/test/kotlin/usecase/ReportGenerationUseCaseTest.kt
+++ b/src/test/kotlin/usecase/ReportGenerationUseCaseTest.kt
@@ -10,7 +10,7 @@ package usecase
 
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
-import usecase.SurgicalProcessData.simpleSurgicalProcess
+import data.SurgicalProcessData.simpleSurgicalProcess
 import java.time.Instant
 import java.util.Date
 
diff --git a/src/test/kotlin/usecase/aggregation/AggregateRoomEnvironmentalDataExtractorTest.kt b/src/test/kotlin/usecase/aggregation/AggregateRoomEnvironmentalDataExtractorTest.kt
index f64dd08..37d9e2a 100644
--- a/src/test/kotlin/usecase/aggregation/AggregateRoomEnvironmentalDataExtractorTest.kt
+++ b/src/test/kotlin/usecase/aggregation/AggregateRoomEnvironmentalDataExtractorTest.kt
@@ -17,7 +17,7 @@ import entity.room.RoomEnvironmentalData
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.doubles.plusOrMinus
 import io.kotest.matchers.shouldBe
-import usecase.SurgicalProcessData.listOfRoomEnvironmentalData
+import data.SurgicalProcessData.listOfRoomEnvironmentalData
 
 class AggregateRoomEnvironmentalDataExtractorTest : StringSpec({
     val average = RoomEnvironmentalData(
diff --git a/src/test/kotlin/usecase/aggregation/AggregateVitalSignsExtractorTest.kt b/src/test/kotlin/usecase/aggregation/AggregateVitalSignsExtractorTest.kt
index 2b46730..90952a5 100644
--- a/src/test/kotlin/usecase/aggregation/AggregateVitalSignsExtractorTest.kt
+++ b/src/test/kotlin/usecase/aggregation/AggregateVitalSignsExtractorTest.kt
@@ -16,7 +16,7 @@ import entity.measurements.Temperature
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.doubles.plusOrMinus
 import io.kotest.matchers.shouldBe
-import usecase.SurgicalProcessData.listOfPatientVitalSigns
+import data.SurgicalProcessData.listOfPatientVitalSigns
 
 class AggregateVitalSignsExtractorTest : StringSpec({
     val average = PatientVitalSigns(