diff --git a/src/features/call/call_base.R b/src/features/call/call_base.R
index 2d5b5608..b5a01025 100644
--- a/src/features/call/call_base.R
+++ b/src/features/call/call_base.R
@@ -1,3 +1,5 @@
+library('tidyr')
+
 filter_by_day_segment <- function(data, day_segment) {
   if(day_segment %in% c("morning", "afternoon", "evening", "night"))
     data <- data %>% filter(local_day_segment == day_segment)
@@ -37,15 +39,18 @@ base_call_features <- function(calls, call_type, day_segment, requested_features
     for(feature_name in features_to_compute){
         if(feature_name == "countmostfrequentcontact"){
             # Get the number of messages for the most frequent contact throughout the study
-            feature <- calls %>% group_by(trace) %>% 
+            mostfrequentcontact <- calls %>% 
+                group_by(trace) %>% 
                 mutate(N=n()) %>% 
                 ungroup() %>%
                 filter(N == max(N)) %>% 
                 head(1) %>% # if there are multiple contacts with the same amount of messages pick the first one only
+                pull(trace)
+            feature <- calls %>% 
+                filter(trace == mostfrequentcontact) %>% 
                 group_by(local_date) %>% 
-                summarise(!!paste("call", call_type, day_segment, feature_name, sep = "_") := N)  %>% 
+                summarise(!!paste("call", call_type, day_segment, feature_name, sep = "_") := n())  %>% 
                 replace(is.na(.), 0)
-
             features <- merge(features, feature, by="local_date", all = TRUE)
         } else {
             feature <- calls %>% 
@@ -67,6 +72,6 @@ base_call_features <- function(calls, call_type, day_segment, requested_features
             features <- merge(features, feature, by="local_date", all = TRUE)
         }
     }
-
+    features <- features %>% mutate_at(vars(contains("countmostfrequentcontact")), list( ~ replace_na(., 0)))
     return(features)
 }
\ No newline at end of file
diff --git a/src/features/sms/sms_base.R b/src/features/sms/sms_base.R
index 31620192..bce0da58 100644
--- a/src/features/sms/sms_base.R
+++ b/src/features/sms/sms_base.R
@@ -1,3 +1,5 @@
+library('tidyr')
+
 filter_by_day_segment <- function(data, day_segment) {
   if(day_segment %in% c("morning", "afternoon", "evening", "night"))
     data <- data %>% filter(local_day_segment == day_segment)
@@ -29,17 +31,31 @@ base_sms_features <- function(sms, sms_type, day_segment, requested_features){
 
     for(feature_name in features_to_compute){
         if(feature_name == "countmostfrequentcontact"){
-            # Get the number of messages for the most frequent contact throughout the study
-            feature <- sms %>% group_by(trace) %>% 
+                        # Get the number of messages for the most frequent contact throughout the study
+            mostfrequentcontact <- sms %>% 
+                group_by(trace) %>% 
                 mutate(N=n()) %>% 
                 ungroup() %>%
                 filter(N == max(N)) %>% 
                 head(1) %>% # if there are multiple contacts with the same amount of messages pick the first one only
+                pull(trace)
+            feature <- sms %>% 
+                filter(trace == mostfrequentcontact) %>% 
                 group_by(local_date) %>% 
-                summarise(!!paste("sms", sms_type, day_segment, feature_name, sep = "_") := N)  %>% 
+                summarise(!!paste("sms", sms_type, day_segment, feature_name, sep = "_") := n())  %>% 
                 replace(is.na(.), 0)
-
             features <- merge(features, feature, by="local_date", all = TRUE)
+            # # Get the number of messages for the most frequent contact throughout the study
+            # feature <- sms %>% group_by(trace) %>% 
+            #     mutate(N=n()) %>% 
+            #     ungroup() %>%
+            #     filter(N == max(N)) %>% 
+            #     head(1) %>% # if there are multiple contacts with the same amount of messages pick the first one only
+            #     group_by(local_date) %>% 
+            #     summarise(!!paste("sms", sms_type, day_segment, feature_name, sep = "_") := N)  %>% 
+            #     replace(is.na(.), 0)
+
+            # features <- merge(features, feature, by="local_date", all = TRUE)
         } else {
             feature <- sms %>% 
                 group_by(local_date)
@@ -53,6 +69,6 @@ base_sms_features <- function(sms, sms_type, day_segment, requested_features){
             features <- merge(features, feature, by="local_date", all = TRUE)
         }
     }
-
+    features <- features %>% mutate_at(vars(contains("countmostfrequentcontact")), list( ~ replace_na(., 0)))
     return(features)
 }
\ No newline at end of file
diff --git a/tests/data/external/test02 b/tests/data/external/test02
new file mode 100644
index 00000000..857a2c20
--- /dev/null
+++ b/tests/data/external/test02
@@ -0,0 +1,4 @@
+7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w
+ios
+test02 ios
+2020/01/01,2020/06/01 
\ No newline at end of file
diff --git a/tests/data/processed/test01/call_incoming_daily.csv b/tests/data/processed/test01/call_incoming_daily.csv
index 49a6652b..f16631a0 100644
--- a/tests/data/processed/test01/call_incoming_daily.csv
+++ b/tests/data/processed/test01/call_incoming_daily.csv
@@ -1,2 +1,3 @@
 "local_date","call_incoming_daily_count","call_incoming_daily_distinctcontacts","call_incoming_daily_meanduration","call_incoming_daily_sumduration","call_incoming_daily_minduration","call_incoming_daily_maxduration","call_incoming_daily_stdduration","call_incoming_daily_modeduration","call_incoming_daily_entropyduration","call_incoming_daily_timefirstcall","call_incoming_daily_timelastcall","call_incoming_daily_countmostfrequentcontact"
 "2020-06-01",10,6,976.4,9764,213,1719,465.141603289913,439,2.18820020272087,163,1331,5
+"2020-06-02",5,5,1213.2,6066,667,1719,375.767481296612,667,1.56941860966338,519,1331,1
diff --git a/tests/data/processed/test01/call_incoming_evening.csv b/tests/data/processed/test01/call_incoming_evening.csv
index 02a06fae..1ec1c738 100644
--- a/tests/data/processed/test01/call_incoming_evening.csv
+++ b/tests/data/processed/test01/call_incoming_evening.csv
@@ -1,2 +1,3 @@
 "local_date","call_incoming_evening_count","call_incoming_evening_distinctcontacts","call_incoming_evening_meanduration","call_incoming_evening_sumduration","call_incoming_evening_minduration","call_incoming_evening_maxduration","call_incoming_evening_stdduration","call_incoming_evening_modeduration","call_incoming_evening_entropyduration","call_incoming_evening_timefirstcall","call_incoming_evening_timelastcall","call_incoming_evening_countmostfrequentcontact"
 "2020-06-01",3,3,1366.66666666667,4100,1157,1719,306.963081384934,1157,1.08260122332248,1144,1331,1
+"2020-06-02",3,3,1366.66666666667,4100,1157,1719,306.963081384934,1157,1.08260122332248,1144,1331,1
diff --git a/tests/data/processed/test01/call_incoming_morning.csv b/tests/data/processed/test01/call_incoming_morning.csv
index 9dcff7cf..bc94caa7 100644
--- a/tests/data/processed/test01/call_incoming_morning.csv
+++ b/tests/data/processed/test01/call_incoming_morning.csv
@@ -1,2 +1,3 @@
 "local_date","call_incoming_morning_count","call_incoming_morning_distinctcontacts","call_incoming_morning_meanduration","call_incoming_morning_sumduration","call_incoming_morning_minduration","call_incoming_morning_maxduration","call_incoming_morning_stdduration","call_incoming_morning_modeduration","call_incoming_morning_entropyduration","call_incoming_morning_timefirstcall","call_incoming_morning_timelastcall","call_incoming_morning_countmostfrequentcontact"
 "2020-06-01",2,2,983,1966,667,1299,446.891485709898,667,0.640802774623272,519,600,1
+"2020-06-02",2,2,983,1966,667,1299,446.891485709898,667,0.640802774623272,519,600,1
diff --git a/tests/data/processed/test01/call_missed_daily.csv b/tests/data/processed/test01/call_missed_daily.csv
index 90a296d7..77d7e8ee 100644
--- a/tests/data/processed/test01/call_missed_daily.csv
+++ b/tests/data/processed/test01/call_missed_daily.csv
@@ -1,2 +1,3 @@
 "local_date","call_missed_daily_count","call_missed_daily_distinctcontacts","call_missed_daily_timefirstcall","call_missed_daily_timelastcall","call_missed_daily_countmostfrequentcontact"
 "2020-06-01",6,3,13,1167,4
+"2020-06-02",2,2,589,1167,1
diff --git a/tests/data/processed/test01/call_missed_evening.csv b/tests/data/processed/test01/call_missed_evening.csv
index 290cf82b..c636f34c 100644
--- a/tests/data/processed/test01/call_missed_evening.csv
+++ b/tests/data/processed/test01/call_missed_evening.csv
@@ -1,2 +1,3 @@
 "local_date","call_missed_evening_count","call_missed_evening_distinctcontacts","call_missed_evening_timefirstcall","call_missed_evening_timelastcall","call_missed_evening_countmostfrequentcontact"
 "2020-06-01",1,1,1167,1167,1
+"2020-06-02",1,1,1167,1167,1
diff --git a/tests/data/processed/test01/call_missed_morning.csv b/tests/data/processed/test01/call_missed_morning.csv
index 6a15d565..36b37224 100644
--- a/tests/data/processed/test01/call_missed_morning.csv
+++ b/tests/data/processed/test01/call_missed_morning.csv
@@ -1,2 +1,3 @@
 "local_date","call_missed_morning_count","call_missed_morning_distinctcontacts","call_missed_morning_timefirstcall","call_missed_morning_timelastcall","call_missed_morning_countmostfrequentcontact"
 "2020-06-01",1,1,589,589,1
+"2020-06-02",1,1,589,589,1
diff --git a/tests/data/processed/test01/call_outgoing_daily.csv b/tests/data/processed/test01/call_outgoing_daily.csv
index 1b8782bd..fe3a2fac 100644
--- a/tests/data/processed/test01/call_outgoing_daily.csv
+++ b/tests/data/processed/test01/call_outgoing_daily.csv
@@ -1,2 +1,3 @@
 "local_date","call_outgoing_daily_count","call_outgoing_daily_distinctcontacts","call_outgoing_daily_meanduration","call_outgoing_daily_sumduration","call_outgoing_daily_minduration","call_outgoing_daily_maxduration","call_outgoing_daily_stdduration","call_outgoing_daily_modeduration","call_outgoing_daily_entropyduration","call_outgoing_daily_timefirstcall","call_outgoing_daily_timelastcall","call_outgoing_daily_countmostfrequentcontact"
 "2020-06-01",8,6,1168,9344,759,1543,250.842010607702,970,2.05922274128194,172,1277,3
+"2020-06-02",5,5,1179.8,5899,759,1543,310.478179587552,1116,1.58127936063292,418,1277,1
diff --git a/tests/data/processed/test01/call_outgoing_evening.csv b/tests/data/processed/test01/call_outgoing_evening.csv
index 94ab07c0..64aee2fe 100644
--- a/tests/data/processed/test01/call_outgoing_evening.csv
+++ b/tests/data/processed/test01/call_outgoing_evening.csv
@@ -1,2 +1,3 @@
 "local_date","call_outgoing_evening_count","call_outgoing_evening_distinctcontacts","call_outgoing_evening_meanduration","call_outgoing_evening_sumduration","call_outgoing_evening_minduration","call_outgoing_evening_maxduration","call_outgoing_evening_stdduration","call_outgoing_evening_modeduration","call_outgoing_evening_entropyduration","call_outgoing_evening_timefirstcall","call_outgoing_evening_timelastcall","call_outgoing_evening_countmostfrequentcontact"
 "2020-06-01",2,2,1482,2964,1421,1543,86.2670273047588,1421,0.692468534923961,1156,1277,1
+"2020-06-02",2,2,1482,2964,1421,1543,86.2670273047588,1421,0.692468534923961,1156,1277,1
diff --git a/tests/data/processed/test01/call_outgoing_morning.csv b/tests/data/processed/test01/call_outgoing_morning.csv
index 3c5dc871..b4a3bdf7 100644
--- a/tests/data/processed/test01/call_outgoing_morning.csv
+++ b/tests/data/processed/test01/call_outgoing_morning.csv
@@ -1,2 +1,3 @@
 "local_date","call_outgoing_morning_count","call_outgoing_morning_distinctcontacts","call_outgoing_morning_meanduration","call_outgoing_morning_sumduration","call_outgoing_morning_minduration","call_outgoing_morning_maxduration","call_outgoing_morning_stdduration","call_outgoing_morning_modeduration","call_outgoing_morning_entropyduration","call_outgoing_morning_timefirstcall","call_outgoing_morning_timelastcall","call_outgoing_morning_countmostfrequentcontact"
 "2020-06-01",3,3,978.333333333333,2935,759,1116,192.000868053593,1116,1.08558305836162,418,687,1
+"2020-06-02",3,3,978.333333333333,2935,759,1116,192.000868053593,1116,1.08558305836162,418,687,1
diff --git a/tests/data/processed/test01/sms_received_daily.csv b/tests/data/processed/test01/sms_received_daily.csv
index 08861016..3683c908 100644
--- a/tests/data/processed/test01/sms_received_daily.csv
+++ b/tests/data/processed/test01/sms_received_daily.csv
@@ -1,2 +1,3 @@
 "local_date","sms_received_daily_countmostfrequentcontact","sms_received_daily_count","sms_received_daily_distinctcontacts","sms_received_daily_timefirstsms","sms_received_daily_timelastsms"
 "2020-05-28",7,12,6,6,1382
+"2020-05-29",3,6,4,401,1382
diff --git a/tests/data/processed/test01/sms_received_evening.csv b/tests/data/processed/test01/sms_received_evening.csv
index 8e8309c9..9976fc09 100644
--- a/tests/data/processed/test01/sms_received_evening.csv
+++ b/tests/data/processed/test01/sms_received_evening.csv
@@ -1,2 +1,3 @@
 "local_date","sms_received_evening_countmostfrequentcontact","sms_received_evening_count","sms_received_evening_distinctcontacts","sms_received_evening_timefirstsms","sms_received_evening_timelastsms"
 "2020-05-28",2,3,2,1173,1382
+"2020-05-29",2,3,2,1173,1382
diff --git a/tests/data/processed/test01/sms_received_morning.csv b/tests/data/processed/test01/sms_received_morning.csv
index a8ee03af..dc281938 100644
--- a/tests/data/processed/test01/sms_received_morning.csv
+++ b/tests/data/processed/test01/sms_received_morning.csv
@@ -1,2 +1,3 @@
 "local_date","sms_received_morning_countmostfrequentcontact","sms_received_morning_count","sms_received_morning_distinctcontacts","sms_received_morning_timefirstsms","sms_received_morning_timelastsms"
 "2020-05-28",1,3,3,401,660
+"2020-05-29",1,3,3,401,660
diff --git a/tests/data/processed/test01/sms_sent_daily.csv b/tests/data/processed/test01/sms_sent_daily.csv
index 9eb6d5b8..8638ad3f 100644
--- a/tests/data/processed/test01/sms_sent_daily.csv
+++ b/tests/data/processed/test01/sms_sent_daily.csv
@@ -1,2 +1,3 @@
 "local_date","sms_sent_daily_countmostfrequentcontact","sms_sent_daily_count","sms_sent_daily_distinctcontacts","sms_sent_daily_timefirstsms","sms_sent_daily_timelastsms"
 "2020-05-28",3,8,6,219,1401
+"2020-05-29",1,4,4,388,1401
diff --git a/tests/data/processed/test01/sms_sent_evening.csv b/tests/data/processed/test01/sms_sent_evening.csv
index 921b7a2b..c034593c 100644
--- a/tests/data/processed/test01/sms_sent_evening.csv
+++ b/tests/data/processed/test01/sms_sent_evening.csv
@@ -1,2 +1,3 @@
 "local_date","sms_sent_evening_countmostfrequentcontact","sms_sent_evening_count","sms_sent_evening_distinctcontacts","sms_sent_evening_timefirstsms","sms_sent_evening_timelastsms"
 "2020-05-28",1,2,2,1218,1401
+"2020-05-29",1,2,2,1218,1401
diff --git a/tests/data/processed/test01/sms_sent_morning.csv b/tests/data/processed/test01/sms_sent_morning.csv
index 95fa0504..08719542 100644
--- a/tests/data/processed/test01/sms_sent_morning.csv
+++ b/tests/data/processed/test01/sms_sent_morning.csv
@@ -1,2 +1,3 @@
 "local_date","sms_sent_morning_countmostfrequentcontact","sms_sent_morning_count","sms_sent_morning_distinctcontacts","sms_sent_morning_timefirstsms","sms_sent_morning_timelastsms"
 "2020-05-28",1,2,2,388,654
+"2020-05-29",1,2,2,388,654
diff --git a/tests/data/processed/test02/call_incoming_afternoon.csv b/tests/data/processed/test02/call_incoming_afternoon.csv
new file mode 100644
index 00000000..1942e262
--- /dev/null
+++ b/tests/data/processed/test02/call_incoming_afternoon.csv
@@ -0,0 +1,2 @@
+"local_date","call_incoming_afternoon_count","call_incoming_afternoon_distinctcontacts","call_incoming_afternoon_meanduration","call_incoming_afternoon_sumduration","call_incoming_afternoon_minduration","call_incoming_afternoon_maxduration","call_incoming_afternoon_stdduration","call_incoming_afternoon_modeduration","call_incoming_afternoon_entropyduration","call_incoming_afternoon_timefirstcall","call_incoming_afternoon_timelastcall","call_incoming_afternoon_countmostfrequentcontact"
+"2020-06-01",3,3,642.666666666667,1928,213,1053,420.333597673721,1053,0.941278069255821,753,921,1
diff --git a/tests/data/processed/test02/call_incoming_daily.csv b/tests/data/processed/test02/call_incoming_daily.csv
new file mode 100644
index 00000000..00a534df
--- /dev/null
+++ b/tests/data/processed/test02/call_incoming_daily.csv
@@ -0,0 +1,3 @@
+"local_date","call_incoming_daily_count","call_incoming_daily_distinctcontacts","call_incoming_daily_meanduration","call_incoming_daily_sumduration","call_incoming_daily_minduration","call_incoming_daily_maxduration","call_incoming_daily_stdduration","call_incoming_daily_modeduration","call_incoming_daily_entropyduration","call_incoming_daily_timefirstcall","call_incoming_daily_timelastcall","call_incoming_daily_countmostfrequentcontact"
+"2020-06-01",10,10,976.4,9764,213,1719,465.141603289913,439,2.18820020272087,163,1331,1
+"2020-06-02",5,5,1213.2,6066,667,1719,375.767481296612,667,1.56941860966338,519,1331,0
diff --git a/tests/data/processed/test02/call_incoming_evening.csv b/tests/data/processed/test02/call_incoming_evening.csv
new file mode 100644
index 00000000..818ccb94
--- /dev/null
+++ b/tests/data/processed/test02/call_incoming_evening.csv
@@ -0,0 +1,3 @@
+"local_date","call_incoming_evening_count","call_incoming_evening_distinctcontacts","call_incoming_evening_meanduration","call_incoming_evening_sumduration","call_incoming_evening_minduration","call_incoming_evening_maxduration","call_incoming_evening_stdduration","call_incoming_evening_modeduration","call_incoming_evening_entropyduration","call_incoming_evening_timefirstcall","call_incoming_evening_timelastcall","call_incoming_evening_countmostfrequentcontact"
+"2020-06-01",3,3,1366.66666666667,4100,1157,1719,306.963081384934,1157,1.08260122332248,1144,1331,1
+"2020-06-02",3,3,1366.66666666667,4100,1157,1719,306.963081384934,1157,1.08260122332248,1144,1331,0
diff --git a/tests/data/processed/test02/call_incoming_morning.csv b/tests/data/processed/test02/call_incoming_morning.csv
new file mode 100644
index 00000000..c4b4a799
--- /dev/null
+++ b/tests/data/processed/test02/call_incoming_morning.csv
@@ -0,0 +1,3 @@
+"local_date","call_incoming_morning_count","call_incoming_morning_distinctcontacts","call_incoming_morning_meanduration","call_incoming_morning_sumduration","call_incoming_morning_minduration","call_incoming_morning_maxduration","call_incoming_morning_stdduration","call_incoming_morning_modeduration","call_incoming_morning_entropyduration","call_incoming_morning_timefirstcall","call_incoming_morning_timelastcall","call_incoming_morning_countmostfrequentcontact"
+"2020-06-01",2,2,983,1966,667,1299,446.891485709898,667,0.640802774623272,519,600,1
+"2020-06-02",2,2,983,1966,667,1299,446.891485709898,667,0.640802774623272,519,600,0
diff --git a/tests/data/processed/test02/call_incoming_night.csv b/tests/data/processed/test02/call_incoming_night.csv
new file mode 100644
index 00000000..106480d4
--- /dev/null
+++ b/tests/data/processed/test02/call_incoming_night.csv
@@ -0,0 +1,2 @@
+"local_date","call_incoming_night_count","call_incoming_night_distinctcontacts","call_incoming_night_meanduration","call_incoming_night_sumduration","call_incoming_night_minduration","call_incoming_night_maxduration","call_incoming_night_stdduration","call_incoming_night_modeduration","call_incoming_night_entropyduration","call_incoming_night_timefirstcall","call_incoming_night_timelastcall","call_incoming_night_countmostfrequentcontact"
+"2020-06-01",2,2,885,1770,439,1331,630.7392488184,439,0.560434787927257,163,257,1
diff --git a/tests/data/processed/test02/call_missed_afternoon.csv b/tests/data/processed/test02/call_missed_afternoon.csv
new file mode 100644
index 00000000..48a33476
--- /dev/null
+++ b/tests/data/processed/test02/call_missed_afternoon.csv
@@ -0,0 +1,2 @@
+"local_date","call_missed_afternoon_count","call_missed_afternoon_distinctcontacts","call_missed_afternoon_timefirstcall","call_missed_afternoon_timelastcall","call_missed_afternoon_countmostfrequentcontact"
+"2020-06-01",1,1,874,874,1
diff --git a/tests/data/processed/test02/call_missed_daily.csv b/tests/data/processed/test02/call_missed_daily.csv
new file mode 100644
index 00000000..6001a0c3
--- /dev/null
+++ b/tests/data/processed/test02/call_missed_daily.csv
@@ -0,0 +1,3 @@
+"local_date","call_missed_daily_count","call_missed_daily_distinctcontacts","call_missed_daily_timefirstcall","call_missed_daily_timelastcall","call_missed_daily_countmostfrequentcontact"
+"2020-06-01",6,6,13,1167,1
+"2020-06-02",2,2,589,1167,0
diff --git a/tests/data/processed/test02/call_missed_evening.csv b/tests/data/processed/test02/call_missed_evening.csv
new file mode 100644
index 00000000..b45270a5
--- /dev/null
+++ b/tests/data/processed/test02/call_missed_evening.csv
@@ -0,0 +1,3 @@
+"local_date","call_missed_evening_count","call_missed_evening_distinctcontacts","call_missed_evening_timefirstcall","call_missed_evening_timelastcall","call_missed_evening_countmostfrequentcontact"
+"2020-06-01",1,1,1167,1167,1
+"2020-06-02",1,1,1167,1167,0
diff --git a/tests/data/processed/test02/call_missed_morning.csv b/tests/data/processed/test02/call_missed_morning.csv
new file mode 100644
index 00000000..4d35ed4b
--- /dev/null
+++ b/tests/data/processed/test02/call_missed_morning.csv
@@ -0,0 +1,3 @@
+"local_date","call_missed_morning_count","call_missed_morning_distinctcontacts","call_missed_morning_timefirstcall","call_missed_morning_timelastcall","call_missed_morning_countmostfrequentcontact"
+"2020-06-01",1,1,589,589,1
+"2020-06-02",1,1,589,589,0
diff --git a/tests/data/processed/test02/call_missed_night.csv b/tests/data/processed/test02/call_missed_night.csv
new file mode 100644
index 00000000..0b9d8859
--- /dev/null
+++ b/tests/data/processed/test02/call_missed_night.csv
@@ -0,0 +1,2 @@
+"local_date","call_missed_night_count","call_missed_night_distinctcontacts","call_missed_night_timefirstcall","call_missed_night_timelastcall","call_missed_night_countmostfrequentcontact"
+"2020-06-01",3,3,13,257,1
diff --git a/tests/data/processed/test02/call_outgoing_afternoon.csv b/tests/data/processed/test02/call_outgoing_afternoon.csv
new file mode 100644
index 00000000..0e8c6fa1
--- /dev/null
+++ b/tests/data/processed/test02/call_outgoing_afternoon.csv
@@ -0,0 +1,2 @@
+"local_date","call_outgoing_afternoon_count","call_outgoing_afternoon_distinctcontacts","call_outgoing_afternoon_meanduration","call_outgoing_afternoon_sumduration","call_outgoing_afternoon_minduration","call_outgoing_afternoon_maxduration","call_outgoing_afternoon_stdduration","call_outgoing_afternoon_modeduration","call_outgoing_afternoon_entropyduration","call_outgoing_afternoon_timefirstcall","call_outgoing_afternoon_timelastcall","call_outgoing_afternoon_countmostfrequentcontact"
+"2020-06-01",2,2,1237.5,2475,1186,1289,72.8319984622144,1289,0.692482998176928,869,1051,1
diff --git a/tests/data/processed/test02/call_outgoing_daily.csv b/tests/data/processed/test02/call_outgoing_daily.csv
new file mode 100644
index 00000000..90f487fb
--- /dev/null
+++ b/tests/data/processed/test02/call_outgoing_daily.csv
@@ -0,0 +1,3 @@
+"local_date","call_outgoing_daily_count","call_outgoing_daily_distinctcontacts","call_outgoing_daily_meanduration","call_outgoing_daily_sumduration","call_outgoing_daily_minduration","call_outgoing_daily_maxduration","call_outgoing_daily_stdduration","call_outgoing_daily_modeduration","call_outgoing_daily_entropyduration","call_outgoing_daily_timefirstcall","call_outgoing_daily_timelastcall","call_outgoing_daily_countmostfrequentcontact"
+"2020-06-01",8,8,1168,9344,759,1543,250.842010607702,970,2.05922274128194,172,1277,1
+"2020-06-02",5,5,1179.8,5899,759,1543,310.478179587552,1116,1.58127936063292,418,1277,0
diff --git a/tests/data/processed/test02/call_outgoing_evening.csv b/tests/data/processed/test02/call_outgoing_evening.csv
new file mode 100644
index 00000000..5f5daeec
--- /dev/null
+++ b/tests/data/processed/test02/call_outgoing_evening.csv
@@ -0,0 +1,3 @@
+"local_date","call_outgoing_evening_count","call_outgoing_evening_distinctcontacts","call_outgoing_evening_meanduration","call_outgoing_evening_sumduration","call_outgoing_evening_minduration","call_outgoing_evening_maxduration","call_outgoing_evening_stdduration","call_outgoing_evening_modeduration","call_outgoing_evening_entropyduration","call_outgoing_evening_timefirstcall","call_outgoing_evening_timelastcall","call_outgoing_evening_countmostfrequentcontact"
+"2020-06-01",2,2,1482,2964,1421,1543,86.2670273047588,1421,0.692468534923961,1156,1277,1
+"2020-06-02",2,2,1482,2964,1421,1543,86.2670273047588,1421,0.692468534923961,1156,1277,0
diff --git a/tests/data/processed/test02/call_outgoing_morning.csv b/tests/data/processed/test02/call_outgoing_morning.csv
new file mode 100644
index 00000000..9c4d53b8
--- /dev/null
+++ b/tests/data/processed/test02/call_outgoing_morning.csv
@@ -0,0 +1,3 @@
+"local_date","call_outgoing_morning_count","call_outgoing_morning_distinctcontacts","call_outgoing_morning_meanduration","call_outgoing_morning_sumduration","call_outgoing_morning_minduration","call_outgoing_morning_maxduration","call_outgoing_morning_stdduration","call_outgoing_morning_modeduration","call_outgoing_morning_entropyduration","call_outgoing_morning_timefirstcall","call_outgoing_morning_timelastcall","call_outgoing_morning_countmostfrequentcontact"
+"2020-06-01",3,3,978.333333333333,2935,759,1116,192.000868053593,1116,1.08558305836162,418,687,1
+"2020-06-02",3,3,978.333333333333,2935,759,1116,192.000868053593,1116,1.08558305836162,418,687,0
diff --git a/tests/data/processed/test02/call_outgoing_night.csv b/tests/data/processed/test02/call_outgoing_night.csv
new file mode 100644
index 00000000..cb0303cb
--- /dev/null
+++ b/tests/data/processed/test02/call_outgoing_night.csv
@@ -0,0 +1,2 @@
+"local_date","call_outgoing_night_count","call_outgoing_night_distinctcontacts","call_outgoing_night_meanduration","call_outgoing_night_sumduration","call_outgoing_night_minduration","call_outgoing_night_maxduration","call_outgoing_night_stdduration","call_outgoing_night_modeduration","call_outgoing_night_entropyduration","call_outgoing_night_timefirstcall","call_outgoing_night_timelastcall","call_outgoing_night_countmostfrequentcontact"
+"2020-06-01",1,1,970,970,970,970,NA,970,0,172,172,1
diff --git a/tests/data/processed/test02/screen_afternoon.csv b/tests/data/processed/test02/screen_afternoon.csv
new file mode 100644
index 00000000..89d5e63d
--- /dev/null
+++ b/tests/data/processed/test02/screen_afternoon.csv
@@ -0,0 +1,2 @@
+local_date,screen_afternoon_countepisodeunlock,screen_afternoon_episodepersensedminutesunlock,screen_afternoon_sumdurationunlock,screen_afternoon_maxdurationunlock,screen_afternoon_mindurationunlock,screen_afternoon_avgdurationunlock,screen_afternoon_stddurationunlock,screen_afternoon_firstuseafter00unlock
+2020-06-01,3,0.05,30.09043333333333,12.55,8.533333333333333,10.030144444444444,2.1950780690579683,43200
diff --git a/tests/data/processed/test02/screen_daily.csv b/tests/data/processed/test02/screen_daily.csv
new file mode 100644
index 00000000..03085d9b
--- /dev/null
+++ b/tests/data/processed/test02/screen_daily.csv
@@ -0,0 +1,2 @@
+local_date,screen_daily_countepisodeunlock,screen_daily_episodepersensedminutesunlock,screen_daily_sumdurationunlock,screen_daily_maxdurationunlock,screen_daily_mindurationunlock,screen_daily_avgdurationunlock,screen_daily_stddurationunlock,screen_daily_firstuseafter00unlock
+2020-06-01,7,0.029166666666666667,94.6528166666666,21.6598833333333,6.00145,13.521830952380942,6.189885966253717,10230
diff --git a/tests/data/processed/test02/screen_deltas.csv b/tests/data/processed/test02/screen_deltas.csv
new file mode 100644
index 00000000..7cdedb62
--- /dev/null
+++ b/tests/data/processed/test02/screen_deltas.csv
@@ -0,0 +1,8 @@
+"episode_id","episode","screen_sequence","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
+2,"unlock","3, 2",6.00145,"2020-06-01 02:50:30","2020-06-01 02:56:30","2020-06-01","2020-06-01","night","night"
+4,"unlock","3, 2",6.9984,"2020-06-01 05:56:51","2020-06-01 06:03:51","2020-06-01","2020-06-01","night","morning"
+6,"unlock","3, 2",21.6598833333333,"2020-06-01 10:00:24","2020-06-01 10:22:04","2020-06-01","2020-06-01","morning","morning"
+8,"unlock","3, 2",15.00205,"2020-06-01 11:57:33","2020-06-01 12:12:33","2020-06-01","2020-06-01","morning","afternoon"
+10,"unlock","3, 2",9.0071,"2020-06-01 14:51:02","2020-06-01 15:00:02","2020-06-01","2020-06-01","afternoon","afternoon"
+12,"unlock","3, 2",16.98925,"2020-06-01 17:51:27","2020-06-01 18:08:26","2020-06-01","2020-06-01","afternoon","evening"
+14,"unlock","3, 2",18.9946833333333,"2020-06-01 20:42:58","2020-06-01 21:01:58","2020-06-01","2020-06-01","evening","evening"
diff --git a/tests/data/processed/test02/screen_evening.csv b/tests/data/processed/test02/screen_evening.csv
new file mode 100644
index 00000000..4fdb2bbd
--- /dev/null
+++ b/tests/data/processed/test02/screen_evening.csv
@@ -0,0 +1,2 @@
+local_date,screen_evening_countepisodeunlock,screen_evening_episodepersensedminutesunlock,screen_evening_sumdurationunlock,screen_evening_maxdurationunlock,screen_evening_mindurationunlock,screen_evening_avgdurationunlock,screen_evening_stddurationunlock,screen_evening_firstuseafter00unlock
+2020-06-01,2,0.02857142857142857,27.428016666666636,18.994683333333302,8.433333333333334,13.714008333333318,7.468002203484522,64800
diff --git a/tests/data/processed/test02/screen_morning.csv b/tests/data/processed/test02/screen_morning.csv
new file mode 100644
index 00000000..715ea281
--- /dev/null
+++ b/tests/data/processed/test02/screen_morning.csv
@@ -0,0 +1,2 @@
+local_date,screen_morning_countepisodeunlock,screen_morning_episodepersensedminutesunlock,screen_morning_sumdurationunlock,screen_morning_maxdurationunlock,screen_morning_mindurationunlock,screen_morning_avgdurationunlock,screen_morning_stddurationunlock,screen_morning_firstuseafter00unlock
+2020-06-01,3,0.046153846153846156,27.943216666666636,21.6598833333333,2.433333333333333,9.314405555555545,10.714935943920263,21600
diff --git a/tests/data/processed/test02/screen_night.csv b/tests/data/processed/test02/screen_night.csv
new file mode 100644
index 00000000..ffc21f93
--- /dev/null
+++ b/tests/data/processed/test02/screen_night.csv
@@ -0,0 +1,2 @@
+local_date,screen_night_countepisodeunlock,screen_night_episodepersensedminutesunlock,screen_night_sumdurationunlock,screen_night_maxdurationunlock,screen_night_mindurationunlock,screen_night_avgdurationunlock,screen_night_stddurationunlock,screen_night_firstuseafter00unlock
+2020-06-01,2,0.044444444444444446,9.134783333333333,6.00145,3.1333333333333333,4.5673916666666665,2.0280647442341566,10230
diff --git a/tests/data/processed/test02/sms_received_afternoon.csv b/tests/data/processed/test02/sms_received_afternoon.csv
new file mode 100644
index 00000000..ef130628
--- /dev/null
+++ b/tests/data/processed/test02/sms_received_afternoon.csv
@@ -0,0 +1,2 @@
+"local_date","sms_received_afternoon_countmostfrequentcontact","sms_received_afternoon_count","sms_received_afternoon_distinctcontacts","sms_received_afternoon_timefirstsms","sms_received_afternoon_timelastsms"
+"2020-05-28",1,2,2,830,949
diff --git a/tests/data/processed/test02/sms_received_daily.csv b/tests/data/processed/test02/sms_received_daily.csv
new file mode 100644
index 00000000..556f361b
--- /dev/null
+++ b/tests/data/processed/test02/sms_received_daily.csv
@@ -0,0 +1,3 @@
+"local_date","sms_received_daily_countmostfrequentcontact","sms_received_daily_count","sms_received_daily_distinctcontacts","sms_received_daily_timefirstsms","sms_received_daily_timelastsms"
+"2020-05-28",1,12,12,6,1382
+"2020-05-29",0,6,6,401,1382
diff --git a/tests/data/processed/test02/sms_received_evening.csv b/tests/data/processed/test02/sms_received_evening.csv
new file mode 100644
index 00000000..691965d1
--- /dev/null
+++ b/tests/data/processed/test02/sms_received_evening.csv
@@ -0,0 +1,3 @@
+"local_date","sms_received_evening_countmostfrequentcontact","sms_received_evening_count","sms_received_evening_distinctcontacts","sms_received_evening_timefirstsms","sms_received_evening_timelastsms"
+"2020-05-28",1,3,3,1173,1382
+"2020-05-29",0,3,3,1173,1382
diff --git a/tests/data/processed/test02/sms_received_morning.csv b/tests/data/processed/test02/sms_received_morning.csv
new file mode 100644
index 00000000..23140211
--- /dev/null
+++ b/tests/data/processed/test02/sms_received_morning.csv
@@ -0,0 +1,3 @@
+"local_date","sms_received_morning_countmostfrequentcontact","sms_received_morning_count","sms_received_morning_distinctcontacts","sms_received_morning_timefirstsms","sms_received_morning_timelastsms"
+"2020-05-28",1,3,3,401,660
+"2020-05-29",0,3,3,401,660
diff --git a/tests/data/processed/test02/sms_received_night.csv b/tests/data/processed/test02/sms_received_night.csv
new file mode 100644
index 00000000..36f3809d
--- /dev/null
+++ b/tests/data/processed/test02/sms_received_night.csv
@@ -0,0 +1,2 @@
+"local_date","sms_received_night_countmostfrequentcontact","sms_received_night_count","sms_received_night_distinctcontacts","sms_received_night_timefirstsms","sms_received_night_timelastsms"
+"2020-05-28",1,4,4,6,312
diff --git a/tests/data/processed/test02/sms_sent_afternoon.csv b/tests/data/processed/test02/sms_sent_afternoon.csv
new file mode 100644
index 00000000..96e4a9d9
--- /dev/null
+++ b/tests/data/processed/test02/sms_sent_afternoon.csv
@@ -0,0 +1,2 @@
+"local_date","sms_sent_afternoon_countmostfrequentcontact","sms_sent_afternoon_count","sms_sent_afternoon_distinctcontacts","sms_sent_afternoon_timefirstsms","sms_sent_afternoon_timelastsms"
+"2020-05-28",1,3,3,722,979
diff --git a/tests/data/processed/test02/sms_sent_daily.csv b/tests/data/processed/test02/sms_sent_daily.csv
new file mode 100644
index 00000000..0e446cec
--- /dev/null
+++ b/tests/data/processed/test02/sms_sent_daily.csv
@@ -0,0 +1,3 @@
+"local_date","sms_sent_daily_countmostfrequentcontact","sms_sent_daily_count","sms_sent_daily_distinctcontacts","sms_sent_daily_timefirstsms","sms_sent_daily_timelastsms"
+"2020-05-28",1,8,8,219,1401
+"2020-05-29",0,4,4,388,1401
diff --git a/tests/data/processed/test02/sms_sent_evening.csv b/tests/data/processed/test02/sms_sent_evening.csv
new file mode 100644
index 00000000..4195852f
--- /dev/null
+++ b/tests/data/processed/test02/sms_sent_evening.csv
@@ -0,0 +1,3 @@
+"local_date","sms_sent_evening_countmostfrequentcontact","sms_sent_evening_count","sms_sent_evening_distinctcontacts","sms_sent_evening_timefirstsms","sms_sent_evening_timelastsms"
+"2020-05-28",1,2,2,1218,1401
+"2020-05-29",0,2,2,1218,1401
diff --git a/tests/data/processed/test02/sms_sent_morning.csv b/tests/data/processed/test02/sms_sent_morning.csv
new file mode 100644
index 00000000..db650744
--- /dev/null
+++ b/tests/data/processed/test02/sms_sent_morning.csv
@@ -0,0 +1,3 @@
+"local_date","sms_sent_morning_countmostfrequentcontact","sms_sent_morning_count","sms_sent_morning_distinctcontacts","sms_sent_morning_timefirstsms","sms_sent_morning_timelastsms"
+"2020-05-28",1,2,2,388,654
+"2020-05-29",0,2,2,388,654
diff --git a/tests/data/processed/test02/sms_sent_night.csv b/tests/data/processed/test02/sms_sent_night.csv
new file mode 100644
index 00000000..92ef2e04
--- /dev/null
+++ b/tests/data/processed/test02/sms_sent_night.csv
@@ -0,0 +1,2 @@
+"local_date","sms_sent_night_countmostfrequentcontact","sms_sent_night_count","sms_sent_night_distinctcontacts","sms_sent_night_timefirstsms","sms_sent_night_timelastsms"
+"2020-05-28",1,1,1,219,219
diff --git a/tests/data/raw/test01/calls_raw.csv b/tests/data/raw/test01/calls_raw.csv
index 73be7e5b..c2f112b4 100644
--- a/tests/data/raw/test01/calls_raw.csv
+++ b/tests/data/raw/test01/calls_raw.csv
@@ -22,4 +22,16 @@ timestamp,device_id,call_type,call_duration,trace
 1590999462000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,1331,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
 1590994337000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,970,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
 1590999471000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,3,0,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
-1590993791000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,439,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
\ No newline at end of file
+1590993791000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,439,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591106425000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,1299,OwyykjwekUUwhaCHEODWV5lZICBzdyLPnTE2wVL5
+1591105765000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,3,0,OwyykjwekUUwhaCHEODWV5lZICBzdyLPnTE2wVL5
+1591095525000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,1116,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591101177000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,1060,cnUUS8QfrJ16VB6cakgg7IBWGP2OFzpJ7xlBAG8S
+1591111670000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,759,1RgyLrcxRB4kPDTpszr6ocy2qtxvtyoTGl1WltUF
+1591101594000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,667,JGtSHqWU2rTwJsHNzFiAzHUNHHYLYNUKjrGmB7G4
+1591139091000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,1157,jVa0Xjl53p52AStkexUSNzJYHgcDihBWFeBmsAzr
+1591143259000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,1719,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591139798000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,1421,YTCSxqJMuECsKhqaTr6uH8xd5qIKNpGCJGvv9W0y
+1591150306000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,1,1224,ekgS3LcK86nxkl3O9jzA3BWU5tJMiYHPbRsdHS2P
+1591147037000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,2,1543,TjnOnOjHqcE2q2yzzwfcFoZfaIKN6VylfqkD0Zk7
+1591140446000,e64uobDo-xNh0-KxYR-UWgR-utH2eyav204r,3,0,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
\ No newline at end of file
diff --git a/tests/data/raw/test01/messages_raw.csv b/tests/data/raw/test01/messages_raw.csv
index a609b5eb..0891eebf 100644
--- a/tests/data/raw/test01/messages_raw.csv
+++ b/tests/data/raw/test01/messages_raw.csv
@@ -18,4 +18,14 @@ timestamp,device_id,message_type,trace
 1590643557000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
 1590651560000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
 1590649392000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
-1590638774000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
\ No newline at end of file
+1590638774000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
+1590764431000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,t00s6SCQrraJw1jlkwAFTSiyAISkMPmzngCL7fbZ
+1590749105000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,FoQBWR2r8GS4WmuEKIvcEkJbxskbYg6VOsbLU1Wr
+1590748918000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
+1590764050000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,vfnqxPLJGjCrsPSKkST0iqRia6UwWLfNFAHWaXRs
+1590748134000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
+1590795228000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,Wk15QDFjeGCKI5CVxw2bkjsacmjsjwsHweZuo0Om
+1590808862000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,Wk15QDFjeGCKI5CVxw2bkjsacmjsjwsHweZuo0Om
+1590807778000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
+1590799198000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,1,SFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGr
+1590797892000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,2,FVPAjfv1ZLVs6vqxsqVeBJ1afdbUBXuZ7dByKned
\ No newline at end of file
diff --git a/tests/data/raw/test02/calls_raw.csv b/tests/data/raw/test02/calls_raw.csv
new file mode 100644
index 00000000..97690b0c
--- /dev/null
+++ b/tests/data/raw/test02/calls_raw.csv
@@ -0,0 +1,136 @@
+timestamp,device_id,call_type,call_duration,trace
+1591020025000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,PnTE2wVL5OwyykjwekUUwhaCHEODWV5lZICBzdyL
+1591020045000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,20,PnTE2wVL5OwyykjwekUUwhaCHEODWV5lZICBzdyL
+1591021324000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1279,PnTE2wVL5OwyykjwekUUwhaCHEODWV5lZICBzdyL
+
+1591019365000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,BzdyLPnTE2wVL5OwyykjwekUUwhaCHEODWV5lZIC
+1591019395000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,30,BzdyLPnTE2wVL5OwyykjwekUUwhaCHEODWV5lZIC
+
+1591009125000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591009145000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,20,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591010241000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1096,ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+
+1591014777000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,cnUUS8QfrJ16VB6cakgg7IBWGP2OFzpJ7xlBAG8S
+1591014797000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,20,cnUUS8QfrJ16VB6cakgg7IBWGP2OFzpJ7xlBAG8S
+1591015837000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1040,cnUUS8QfrJ16VB6cakgg7IBWGP2OFzpJ7xlBAG8S
+
+1591025270000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,1RgyLrcxRB4kPDTpszr6ocy2qtxvtyoTGl1WltUF
+1591025287000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,17,1RgyLrcxRB4kPDTpszr6ocy2qtxvtyoTGl1WltUF
+1591026029000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,742,1RgyLrcxRB4kPDTpszr6ocy2qtxvtyoTGl1WltUF
+
+1591015194000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,JGtSHqWU2rTwJsHNzFiAzHUNHHYLYNUKjrGmB7G4
+1591015204000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,10,JGtSHqWU2rTwJsHNzFiAzHUNHHYLYNUKjrGmB7G4
+1591015861000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,657,JGtSHqWU2rTwJsHNzFiAzHUNHHYLYNUKjrGmB7G4
+
+1591039261000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50Z
+1591039276000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,15,4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50Z
+1591039474000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,198,4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50Z
+
+1591036173000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,Pcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXx
+1591036183000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,10,Pcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXx
+1591037462000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1279,Pcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXx
+
+1591036460000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,0AF00XrOYBKFnoU9s1lZQBMCDyVWwIUu7t9FishN
+1591036490000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,30,0AF00XrOYBKFnoU9s1lZQBMCDyVWwIUu7t9FishN
+
+1591030751000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,l0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bz
+1591030763000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,12,l0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bz
+1591031413000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,650,l0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bz
+
+1591029194000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,6qWi08psbtFbnl0GxVYlAoG7e9X81JfYggNULsFh
+1591029207000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,13,6qWi08psbtFbnl0GxVYlAoG7e9X81JfYggNULsFh
+1591030247000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1040,6qWi08psbtFbnl0GxVYlAoG7e9X81JfYggNULsFh
+
+1591047100000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,6uW0vSbblda04AgPYlUMjaOBJ6vHdoeyCVy2xMcE
+1591047116000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,16,6uW0vSbblda04AgPYlUMjaOBJ6vHdoeyCVy2xMcE
+1591048286000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1170,6uW0vSbblda04AgPYlUMjaOBJ6vHdoeyCVy2xMcE
+
+1591052691000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,jVa0Xjl53p52AStkexUSNzJYHgcDihBWFeBmsAzr
+1591052708000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,17,jVa0Xjl53p52AStkexUSNzJYHgcDihBWFeBmsAzr
+1591053848000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1140,jVa0Xjl53p52AStkexUSNzJYHgcDihBWFeBmsAzr
+
+1591056859000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3
+1591056878000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,19,DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3
+1591058578000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1700,DYB9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3
+
+1591053398000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,YTCSxqJMuECsKhqaTr6uH8xd5qIKNpGCJGvv9W0y
+1591053419000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,21,YTCSxqJMuECsKhqaTr6uH8xd5qIKNpGCJGvv9W0y
+1591054819000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1400,YTCSxqJMuECsKhqaTr6uH8xd5qIKNpGCJGvv9W0y
+
+1591063906000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,ekgS3LcK86nxkl3O9jzA3BWU5tJMiYHPbRsdHS2P
+1591063920000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,14,ekgS3LcK86nxkl3O9jzA3BWU5tJMiYHPbRsdHS2P
+1591065130000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1210,ekgS3LcK86nxkl3O9jzA3BWU5tJMiYHPbRsdHS2P
+
+1591060637000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,TjnOnOjHqcE2q2yzzwfcFoZfaIKN6VylfqkD0Zk7
+1591060650000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,13,TjnOnOjHqcE2q2yzzwfcFoZfaIKN6VylfqkD0Zk7
+1591062180000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1530,TjnOnOjHqcE2q2yzzwfcFoZfaIKN6VylfqkD0Zk7
+
+1591054046000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,7dLniNPciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf
+1591054076000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,30,7dLniNPciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf
+
+1590987442000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50Z4NqSk0
+1590987462000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,20,WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50Z4NqSk0
+
+1590984805000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50
+1590984830000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,25,Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi50
+
+1590999462000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi
+1590999473000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,11,50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi
+1591000793000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1320,50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0KXxPcvxi
+
+1590994337000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,XxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0K
+1590994347000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,10,XxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0K
+1590995307000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,960,XxPcvxi50Z4NqSk0WVf7dLniNPciXg3DYB9bzl0K
+
+1590999471000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,B9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3DY
+1590999501000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,30,B9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNPciXg3DY
+
+1590993791000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,TE2wVL5ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf
+1590993810000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,19,TE2wVL5ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf
+1590994230000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,420,TE2wVL5ciXg3DYB9bzl0KXxPcvxi50Z4NqSk0WVf
+
+1591106425000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,7dLniNPOwyykjwekUUwhaCHEODWV5lZICBzdyLPn
+1591106434000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,9,7dLniNPOwyykjwekUUwhaCHEODWV5lZICBzdyLPn
+1591107724000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1290,7dLniNPOwyykjwekUUwhaCHEODWV5lZICBzdyLPn
+
+1591105765000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,UwhaCHEODWV5lZICBzdyLPnTE2wVL5OwyykjwekU
+1591105795000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,30,UwhaCHEODWV5lZICBzdyLPnTE2wVL5OwyykjwekU
+
+1591095525000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,EODWV5lZICzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591095541000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,16,EODWV5lZICzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591096641000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1100,EODWV5lZICzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+
+1591101177000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,WGP2OFzpJ7xlBAG8ScnUUS8QfrJ16VB6cakgg7IB
+1591101187000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,10,WGP2OFzpJ7xlBAG8ScnUUS8QfrJ16VB6cakgg7IB
+1591102237000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1050,WGP2OFzpJ7xlBAG8ScnUUS8QfrJ16VB6cakgg7IB
+
+1591111670000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,txvtyoTGl1WltUF1RgyLrcxRB4kPDTpszr6ocy2q
+1591111679000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,9,txvtyoTGl1WltUF1RgyLrcxRB4kPDTpszr6ocy2q
+1591112429000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,750,txvtyoTGl1WltUF1RgyLrcxRB4kPDTpszr6ocy2q
+
+1591101594000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,AzHUNHHYLYNUKjrGmB7G4JGtSHqWU2rTwJsHNzFi
+1591101601000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,7,AzHUNHHYLYNUKjrGmB7G4JGtSHqWU2rTwJsHNzFi
+1591102261000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,660,AzHUNHHYLYNUKjrGmB7G4JGtSHqWU2rTwJsHNzFi
+
+1591139091000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,NzJYHgcDihBWFeBmsAzrjVa0Xjl53p52AStkexUS
+1591139108000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,17,NzJYHgcDihBWFeBmsAzrjVa0Xjl53p52AStkexUS
+1591140248000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1140,NzJYHgcDihBWFeBmsAzrjVa0Xjl53p52AStkexUS
+
+1591143259000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,FeBmsAzr9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591143268000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,9,FeBmsAzr9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+1591144978000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1710,FeBmsAzr9bzl0KXxPcvxi50Z4NqSk0WVf7dLniNP
+
+1591139798000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,KNpGCJGvv9W0yYTCSxqJMuECsKhqaTr6uH8xd5qI
+1591139809000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,11,KNpGCJGvv9W0yYTCSxqJMuECsKhqaTr6uH8xd5qI
+1591141219000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1410,KNpGCJGvv9W0yYTCSxqJMuECsKhqaTr6uH8xd5qI
+
+1591150306000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,0,YHPbRsdHS2PekgS3LcK86nxkl3O9jzA3BWU5tJMi
+1591150320000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,14,YHPbRsdHS2PekgS3LcK86nxkl3O9jzA3BWU5tJMi
+1591151530000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1210,YHPbRsdHS2PekgS3LcK86nxkl3O9jzA3BWU5tJMi
+
+1591147037000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,faIKN6VylfqkD0Zk7TjnOnOjHqcE2q2yzzwfcFoZ
+1591147050000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,13,faIKN6VylfqkD0Zk7TjnOnOjHqcE2q2yzzwfcFoZ
+1591148580000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,1530,faIKN6VylfqkD0Zk7TjnOnOjHqcE2q2yzzwfcFoZ
+
+1591140446000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3,0,l0KXxPcvxi50ZciXg3DYB9bz4NqSk0WVf7dLniNP
+1591140466000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,4,20,l0KXxPcvxi50ZciXg3DYB9bz4NqSk0WVf7dLniNP
\ No newline at end of file
diff --git a/tests/data/raw/test02/messages_raw.csv b/tests/data/raw/test02/messages_raw.csv
new file mode 100644
index 00000000..bb59edcf
--- /dev/null
+++ b/tests/data/raw/test02/messages_raw.csv
@@ -0,0 +1,31 @@
+timestamp,device_id,message_type,trace
+1590678031000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,CL7fbZt00s6SCQrraJw1jlkwAFTSiyAISkMPmzng
+1590662705000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,VOsbLU1WrFoQBWR2r8GS4WmuEKIvcEkJbxskbYg6
+1590662518000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,RGrSFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2
+1590677650000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,UwWLfNFAHWaXRsvfnqxPLJGjCrsPSKkST0iqRia6
+1590661734000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,C2RGrSFkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyo
+1590695355000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,DhJOo5omWkSnUUoJ2T5maLRAO7SjxOLFB1CfccmP
+1590681732000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,5omWkSnUUoJ2T5maLRAO7SjxOLFB1CfccmPDhJOo
+1590697175000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,GcxyoC2RGrSFkNCC6I3SlHwtvvetmzh3hYpAmXwH
+1590696483000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,M8o0iY89aUD0LNMBeDldSCjXKq4CRJzpu3ntG42X
+1590688241000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,89aUD0LNMBeDldSCjXKq4CRJzpu3ntG42XM8o0iY
+1590708828000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,Zuo0OmWk15QDFjeGCKI5CVxw2bkjsacmjsjwsHwe
+1590722462000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,KI5CVxw2bkjsacmjsjwsHweZuo0OmWk15QDFjeGC
+1590721378000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,HGcxyoC2RGrSFkNCC6I3SlHwtvvetmzh3hYpAmXw
+1590712798000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,XwHGcxyoC2RGrSFkNCC6I3SlHwtvvetmzh3hYpAm
+1590711492000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,VeBJ1afdbUBXuZ7dByKnedFVPAjfv1ZLVs6vqxsq
+1590657155000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,AmXwHGcxyoC2RGrSFkNCC6I3SlHwtvvetmzh3hYp
+1590643557000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,YpAmXwHGcxyoC2RGrSFkNCC6I3SlHwtvvetmzh3h
+1590651560000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,Hwtvvetmzh3hYpAmXwHGcxyoC2RGrSFkNCC6I3Sl
+1590649392000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrSFkNCC6
+1590638774000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrSFkNCC6I3
+1590764431000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,t00s6SCQrraJw1jlkwAFTSiyAISkMPmzngCL7fbZ
+1590749105000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,FoQBWR2r8GS4WmuEKIvcEkJbxskbYg6VOsbLU1Wr
+1590748918000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,C6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrSFkNC
+1590764050000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,vfnqxPLJGjCrsPSKkST0iqRia6UwWLfNFAHWaXRs
+1590748134000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,CC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrSFkN
+1590795228000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,HweZuo0OmWk15QDFjeGCKI5CVxw2bkjsacmjsjws
+1590808862000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,Wk15QDFjeGCKI5CVxw2bkjsacmjsjwsHweZuo0Om
+1590807778000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,NCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrSFk
+1590799198000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,1,FkNCC6I3SlHwtvvetmzh3hYpAmXwHGcxyoC2RGrS
+1590797892000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2,FVPAjfv1ZLVs6vqxsqVeBJ1afdbUBXuZ7dByKned
\ No newline at end of file
diff --git a/tests/data/raw/test02/screen_raw.csv b/tests/data/raw/test02/screen_raw.csv
new file mode 100644
index 00000000..513e9674
--- /dev/null
+++ b/tests/data/raw/test02/screen_raw.csv
@@ -0,0 +1,15 @@
+timestamp,device_id,screen_status
+1590994230688,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1590994590775,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591005411795,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591005831699,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591020024938,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591021324531,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591027053831,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591027953954,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591037462512,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591038002938,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591048287050,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591049306405,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
+1591058578811,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,3
+1591059718492,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,2
\ No newline at end of file
diff --git a/tests/settings/config.yaml b/tests/settings/config.yaml
index 5906bb65..abf0c9cd 100644
--- a/tests/settings/config.yaml
+++ b/tests/settings/config.yaml
@@ -2,4 +2,4 @@ directory: ./
 configfile: ./tests/settings/testing_config.yaml
 snakefile: ./tests/Snakefile
 cores: 1
-forcerun: [sms_features, call_features, screen_features]
+forcerun: [sms_features, call_features, screen_features]
\ No newline at end of file
diff --git a/tests/settings/testing_config.yaml b/tests/settings/testing_config.yaml
index 86532e59..982ec41b 100644
--- a/tests/settings/testing_config.yaml
+++ b/tests/settings/testing_config.yaml
@@ -1,10 +1,11 @@
 # Valid database table name
 SENSORS: [messages, calls, screen]
+#SENSORS: [calls]
 
 # Test Participant data to include in the unit testing
 # You must create a file for each participant
 # named pXXX containing their device_id
-PIDS: [test01]
+PIDS: [test01, test02]
 
 # Global var with common day segments
 DAY_SEGMENTS: &day_segments