diff --git a/config.yaml b/config.yaml
index 851e2f31..a12f90d3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,6 +1,6 @@
 # Participants to include in the analysis
 # You must create a file for each participant named pXXX containing their device_id. This can be done manually or automatically
-PIDS: [t01]
+PIDS: [t01,t02]
 
 # Global var with common day segments
 DAY_SEGMENTS: &day_segments
diff --git a/tests/Snakefile b/tests/Snakefile
index e8c10bca..22e29dba 100644
--- a/tests/Snakefile
+++ b/tests/Snakefile
@@ -5,6 +5,8 @@ include: "../rules/preprocessing.smk"
 include: "../rules/features.smk"
 include: "../rules/reports.smk"
 
+import itertools
+
 files_to_compute = []
 
 if len(config["PIDS"]) == 0:
@@ -30,83 +32,12 @@ if config["PHONE_VALID_SENSED_DAYS"]["COMPUTE"]:
                                 min_valid_hours_per_day=config["PHONE_VALID_SENSED_DAYS"]["MIN_VALID_HOURS_PER_DAY"],
                                 min_valid_bins_per_hour=config["PHONE_VALID_SENSED_DAYS"]["MIN_VALID_BINS_PER_HOUR"]))
 
-if config["MESSAGES"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["MESSAGES"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["MESSAGES"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/messages_{messages_type}_{day_segment}.csv", pid=config["PIDS"], messages_type = config["MESSAGES"]["TYPES"], day_segment = config["MESSAGES"]["DAY_SEGMENTS"]))
-
-if config["CALLS"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["CALLS"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["CALLS"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=config["PIDS"], sensor=config["CALLS"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/calls_{call_type}_{segment}.csv", pid=config["PIDS"], call_type=config["CALLS"]["TYPES"], segment = config["CALLS"]["DAY_SEGMENTS"]))
-
-if config["BLUETOOTH"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["BLUETOOTH"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["BLUETOOTH"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/bluetooth_{segment}.csv", pid=config["PIDS"], segment = config["BLUETOOTH"]["DAY_SEGMENTS"]))
-
-if config["ACTIVITY_RECOGNITION"]["COMPUTE"]:
-    pids_android = list(filter(lambda pid: infer_participant_platform("data/external/" + pid) == "android", config["PIDS"]))
-    pids_ios = list(filter(lambda pid: infer_participant_platform("data/external/" + pid) == "ios", config["PIDS"]))
-    
-    for pids,table in zip([pids_android, pids_ios], [config["ACTIVITY_RECOGNITION"]["DB_TABLE"]["ANDROID"], config["ACTIVITY_RECOGNITION"]["DB_TABLE"]["IOS"]]):
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=pids, sensor=table))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=pids, sensor=table))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=pids, sensor=table))
-        files_to_compute.extend(expand("data/processed/{pid}/{sensor}_deltas.csv", pid=pids, sensor=table))
-    files_to_compute.extend(expand("data/processed/{pid}/activity_recognition_{day_segment}.csv",pid=config["PIDS"], day_segment = config["ACTIVITY_RECOGNITION"]["DAY_SEGMENTS"]))
-
-if config["BATTERY"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=config["PIDS"], sensor=config["BATTERY"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/battery_deltas.csv", pid=config["PIDS"]))
-    files_to_compute.extend(expand("data/processed/{pid}/battery_{day_segment}.csv", pid = config["PIDS"], day_segment = config["BATTERY"]["DAY_SEGMENTS"]))
-
-if config["SCREEN"]["COMPUTE"]:
-    if config["SCREEN"]["DB_TABLE"] in config["PHONE_VALID_SENSED_BINS"]["DB_TABLES"]:
-        files_to_compute.extend(expand("data/interim/{pid}/phone_sensed_bins.csv", pid=config["PIDS"]))
-    else:
-        raise ValueError("Error: Add your screen table (and as many sensor tables as you have) to [PHONE_VALID_SENSED_BINS][DB_TABLES] in config.yaml. This is necessary to compute phone_sensed_bins (bins of time when the smartphone was sensing data)")
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["SCREEN"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["SCREEN"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=config["PIDS"], sensor=config["SCREEN"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/screen_deltas.csv", pid=config["PIDS"]))
-    files_to_compute.extend(expand("data/processed/{pid}/screen_{day_segment}.csv", pid = config["PIDS"], day_segment = config["SCREEN"]["DAY_SEGMENTS"]))
-
-if config["LIGHT"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["LIGHT"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["LIGHT"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/light_{day_segment}.csv", pid = config["PIDS"], day_segment = config["LIGHT"]["DAY_SEGMENTS"]))
-
-if config["APPLICATIONS_FOREGROUND"]["COMPUTE"]:
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["APPLICATIONS_FOREGROUND"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["APPLICATIONS_FOREGROUND"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/interim/{pid}/{sensor}_with_datetime_with_genre.csv", pid=config["PIDS"], sensor=config["APPLICATIONS_FOREGROUND"]["DB_TABLE"]))
-    files_to_compute.extend(expand("data/processed/{pid}/applications_foreground_{day_segment}.csv", pid = config["PIDS"], day_segment = config["APPLICATIONS_FOREGROUND"]["DAY_SEGMENTS"]))
-
-if config["WIFI"]["COMPUTE"]:
-    if len(config["WIFI"]["DB_TABLE"]["VISIBLE_ACCESS_POINTS"]) > 0:
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["WIFI"]["DB_TABLE"]["VISIBLE_ACCESS_POINTS"]))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["WIFI"]["DB_TABLE"]["VISIBLE_ACCESS_POINTS"]))
-        files_to_compute.extend(expand("data/processed/{pid}/wifi_{day_segment}.csv", pid = config["PIDS"], day_segment = config["WIFI"]["DAY_SEGMENTS"]))
-
-    if len(config["WIFI"]["DB_TABLE"]["CONNECTED_ACCESS_POINTS"]) > 0:
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["WIFI"]["DB_TABLE"]["CONNECTED_ACCESS_POINTS"]))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["WIFI"]["DB_TABLE"]["CONNECTED_ACCESS_POINTS"]))
-        files_to_compute.extend(expand("data/processed/{pid}/wifi_{day_segment}.csv", pid = config["PIDS"], day_segment = config["WIFI"]["DAY_SEGMENTS"]))
-
-if config["CONVERSATION"]["COMPUTE"]:
-    pids_android = list(filter(lambda pid: infer_participant_platform("data/external/" + pid) == "android", config["PIDS"]))
-    pids_ios = list(filter(lambda pid: infer_participant_platform("data/external/" + pid) == "ios", config["PIDS"]))
-
-    for pids,table in zip([pids_android, pids_ios], [config["CONVERSATION"]["DB_TABLE"]["ANDROID"], config["CONVERSATION"]["DB_TABLE"]["IOS"]]):
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=pids, sensor=table))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=pids, sensor=table))
-        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime_unified.csv", pid=pids, sensor=table))
-    files_to_compute.extend(expand("data/processed/{pid}/conversation_{day_segment}.csv",pid=config["PIDS"], day_segment = config["CONVERSATION"]["DAY_SEGMENTS"]))
-
+for provider in config["BLUETOOTH"]["PROVIDERS"].keys():
+    if config["BLUETOOTH"]["PROVIDERS"][provider]["COMPUTE"]:
+        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_raw.csv", pid=config["PIDS"], sensor=config["BLUETOOTH"]["DB_TABLE"]))
+        files_to_compute.extend(expand("data/raw/{pid}/{sensor}_with_datetime.csv", pid=config["PIDS"], sensor=config["BLUETOOTH"]["DB_TABLE"]))
+        files_to_compute.extend(expand("data/interim/{pid}/{sensor_key}_features/{sensor_key}_{language}_{provider_key}.csv", pid=config["PIDS"], language=config["BLUETOOTH"]["PROVIDERS"][provider]["SRC_LANGUAGE"], provider_key=provider, sensor_key="BLUETOOTH".lower()))
+        files_to_compute.extend(expand("data/processed/features/{pid}/{sensor_key}.csv", pid=config["PIDS"], sensor_key="BLUETOOTH".lower()))
 
 rule all:
     input:
diff --git a/tests/data/processed/features/test01/bluetooth.csv b/tests/data/processed/features/test01/bluetooth.csv
new file mode 100644
index 00000000..69246e5a
--- /dev/null
+++ b/tests/data/processed/features/test01/bluetooth.csv
@@ -0,0 +1,6 @@
+"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
+"afternoon#2020-07-02#12:00:00#2020-07-02#17:59:59","afternoon","2020-07-02","12:00:00","2020-07-02","17:59:59",2,2,1
+"daily#2020-07-02#00:00:00#2020-07-02#23:59:59","daily","2020-07-02","00:00:00","2020-07-02","23:59:59",14,5,4
+"evening#2020-07-02#18:00:00#2020-07-02#23:59:59","evening","2020-07-02","18:00:00","2020-07-02","23:59:59",5,4,2
+"morning#2020-07-02#06:00:00#2020-07-02#11:59:59","morning","2020-07-02","06:00:00","2020-07-02","11:59:59",3,2,2
+"night#2020-07-02#00:00:00#2020-07-02#05:59:59","night","2020-07-02","00:00:00","2020-07-02","05:59:59",4,4,1
diff --git a/tests/data/processed/features/test02/bluetooth.csv b/tests/data/processed/features/test02/bluetooth.csv
new file mode 100644
index 00000000..cf7d3572
--- /dev/null
+++ b/tests/data/processed/features/test02/bluetooth.csv
@@ -0,0 +1,6 @@
+"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
+"afternoon#2020-07-02#12:00:00#2020-07-02#17:59:59","afternoon","2020-07-02","12:00:00","2020-07-02","17:59:59",2,2,1
+"daily#2020-07-02#00:00:00#2020-07-02#23:59:59","daily","2020-07-02","00:00:00","2020-07-02","23:59:59",14,5,5
+"evening#2020-07-02#18:00:00#2020-07-02#23:59:59","evening","2020-07-02","18:00:00","2020-07-02","23:59:59",5,3,3
+"morning#2020-07-02#06:00:00#2020-07-02#11:59:59","morning","2020-07-02","06:00:00","2020-07-02","11:59:59",3,3,1
+"night#2020-07-02#00:00:00#2020-07-02#05:59:59","night","2020-07-02","00:00:00","2020-07-02","05:59:59",4,2,2
diff --git a/tests/data/processed/features/test03/bluetooth.csv b/tests/data/processed/features/test03/bluetooth.csv
new file mode 100644
index 00000000..0251cdb2
--- /dev/null
+++ b/tests/data/processed/features/test03/bluetooth.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/test04/bluetooth.csv b/tests/data/processed/features/test04/bluetooth.csv
new file mode 100644
index 00000000..0251cdb2
--- /dev/null
+++ b/tests/data/processed/features/test04/bluetooth.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","bluetooth_rapids_countscans","bluetooth_rapids_uniquedevices","bluetooth_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/test01/activity_recognition_afternoon.csv b/tests/data/processed/test01/activity_recognition_afternoon.csv
deleted file mode 100644
index a9fa65eb..00000000
--- a/tests/data/processed/test01/activity_recognition_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_afternoon_count,ar_afternoon_mostcommonactivity,ar_afternoon_countuniqueactivities,ar_afternoon_activitychangecount,ar_afternoon_sumstationary,ar_afternoon_summobile,ar_afternoon_sumvehicle
-2020-07-06,11,0,3,2,91.4326,60.46666666666667,25.433333333333334
diff --git a/tests/data/processed/test01/activity_recognition_daily.csv b/tests/data/processed/test01/activity_recognition_daily.csv
deleted file mode 100644
index 12418f75..00000000
--- a/tests/data/processed/test01/activity_recognition_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_daily_count,ar_daily_mostcommonactivity,ar_daily_countuniqueactivities,ar_daily_activitychangecount,ar_daily_sumstationary,ar_daily_summobile,ar_daily_sumvehicle
-2020-07-06,55,3,8,14,316.39519999999965,286.15086666666673,70.3941833333333
diff --git a/tests/data/processed/test01/activity_recognition_evening.csv b/tests/data/processed/test01/activity_recognition_evening.csv
deleted file mode 100644
index 326bf7f0..00000000
--- a/tests/data/processed/test01/activity_recognition_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_evening_count,ar_evening_mostcommonactivity,ar_evening_countuniqueactivities,ar_evening_activitychangecount,ar_evening_sumstationary,ar_evening_summobile,ar_evening_sumvehicle
-2020-07-06,17,1,6,5,7.609966666666669,120.1363,13.033333333333333
diff --git a/tests/data/processed/test01/activity_recognition_morning.csv b/tests/data/processed/test01/activity_recognition_morning.csv
deleted file mode 100644
index e81eeb79..00000000
--- a/tests/data/processed/test01/activity_recognition_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_morning_count,ar_morning_mostcommonactivity,ar_morning_countuniqueactivities,ar_morning_activitychangecount,ar_morning_sumstationary,ar_morning_summobile,ar_morning_sumvehicle
-2020-07-06,17,0,5,4,46.0,105.53365000000008,31.9119
diff --git a/tests/data/processed/test01/activity_recognition_night.csv b/tests/data/processed/test01/activity_recognition_night.csv
deleted file mode 100644
index 51bafc29..00000000
--- a/tests/data/processed/test01/activity_recognition_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_night_count,ar_night_mostcommonactivity,ar_night_countuniqueactivities,ar_night_activitychangecount,ar_night_sumstationary,ar_night_summobile,ar_night_sumvehicle
-2020-07-06,10,3,3,3,171.33763333333334,0,0
diff --git a/tests/data/processed/test01/applications_foreground_afternoon.csv b/tests/data/processed/test01/applications_foreground_afternoon.csv
deleted file mode 100644
index b80fb405..00000000
--- a/tests/data/processed/test01/applications_foreground_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,apps_afternoon_timeoffirstuseall,apps_afternoon_timeoflastuseall,apps_afternoon_frequencyentropyall,apps_afternoon_countall,apps_afternoon_timeoffirstuseemail,apps_afternoon_timeoflastuseemail,apps_afternoon_frequencyentropyemail,apps_afternoon_countemail,apps_afternoon_timeoffirstusesocial,apps_afternoon_timeoflastusesocial,apps_afternoon_frequencyentropysocial,apps_afternoon_countsocial,apps_afternoon_timeoffirstuseentertainment,apps_afternoon_timeoflastuseentertainment,apps_afternoon_frequencyentropyentertainment,apps_afternoon_countentertainment,apps_afternoon_timeoffirstusetop1global,apps_afternoon_timeoflastusetop1global,apps_afternoon_frequencyentropytop1global,apps_afternoon_counttop1global,apps_afternoon_timeoffirstusecom.facebook.moments,apps_afternoon_timeoflastusecom.facebook.moments,apps_afternoon_frequencyentropycom.facebook.moments,apps_afternoon_countcom.facebook.moments,apps_afternoon_timeoffirstusecom.google.android.youtube,apps_afternoon_timeoflastusecom.google.android.youtube,apps_afternoon_frequencyentropycom.google.android.youtube,apps_afternoon_countcom.google.android.youtube
-2020-07-05,721,889,1.0397207708399179,4,889,889,NA,1,NA,NA,NA,0.0,721,721,NA,1,NA,NA,NA,0.0,798,877,NA,2,NA,NA,NA,0.0
diff --git a/tests/data/processed/test01/applications_foreground_daily.csv b/tests/data/processed/test01/applications_foreground_daily.csv
deleted file mode 100644
index 49c7f0db..00000000
--- a/tests/data/processed/test01/applications_foreground_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,apps_daily_timeoffirstuseall,apps_daily_timeoflastuseall,apps_daily_frequencyentropyall,apps_daily_countall,apps_daily_timeoffirstuseemail,apps_daily_timeoflastuseemail,apps_daily_frequencyentropyemail,apps_daily_countemail,apps_daily_timeoffirstuseentertainment,apps_daily_timeoflastuseentertainment,apps_daily_frequencyentropyentertainment,apps_daily_countentertainment,apps_daily_timeoffirstusesocial,apps_daily_timeoflastusesocial,apps_daily_frequencyentropysocial,apps_daily_countsocial,apps_daily_timeoffirstusetop1global,apps_daily_timeoflastusetop1global,apps_daily_frequencyentropytop1global,apps_daily_counttop1global,apps_daily_timeoffirstusecom.google.android.youtube,apps_daily_timeoflastusecom.google.android.youtube,apps_daily_frequencyentropycom.google.android.youtube,apps_daily_countcom.google.android.youtube,apps_daily_timeoffirstusecom.facebook.moments,apps_daily_timeoflastusecom.facebook.moments,apps_daily_frequencyentropycom.facebook.moments,apps_daily_countcom.facebook.moments
-2020-07-05,17,1359,1.5443819809168389,17,889,1308,NA,2,195,721,0.5982695885852573,7,302,1359,NA,4,195,719,NA,5,NA,NA,NA,0.0,17,877,NA,4
diff --git a/tests/data/processed/test01/applications_foreground_evening.csv b/tests/data/processed/test01/applications_foreground_evening.csv
deleted file mode 100644
index c6a08487..00000000
--- a/tests/data/processed/test01/applications_foreground_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,apps_evening_timeoffirstuseall,apps_evening_timeoflastuseall,apps_evening_frequencyentropyall,apps_evening_countall,apps_evening_timeoffirstuseemail,apps_evening_timeoflastuseemail,apps_evening_frequencyentropyemail,apps_evening_countemail,apps_evening_timeoffirstusesocial,apps_evening_timeoflastusesocial,apps_evening_frequencyentropysocial,apps_evening_countsocial,apps_evening_timeoffirstuseentertainment,apps_evening_timeoflastuseentertainment,apps_evening_frequencyentropyentertainment,apps_evening_countentertainment,apps_evening_timeoffirstusecom.google.android.youtube,apps_evening_timeoflastusecom.google.android.youtube,apps_evening_frequencyentropycom.google.android.youtube,apps_evening_countcom.google.android.youtube,apps_evening_timeoffirstusetop1global,apps_evening_timeoflastusetop1global,apps_evening_frequencyentropytop1global,apps_evening_counttop1global,apps_evening_timeoffirstusecom.facebook.moments,apps_evening_timeoflastusecom.facebook.moments,apps_evening_frequencyentropycom.facebook.moments,apps_evening_countcom.facebook.moments
-2020-07-05,1168,1359,0.6365141682948128,3,1308,1308,NA,1,1168,1359,NA,2,NA,NA,NA,0.0,NA,NA,NA,0.0,NA,NA,NA,0.0,NA,NA,NA,0.0
diff --git a/tests/data/processed/test01/applications_foreground_morning.csv b/tests/data/processed/test01/applications_foreground_morning.csv
deleted file mode 100644
index a768590d..00000000
--- a/tests/data/processed/test01/applications_foreground_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,apps_morning_timeoffirstuseall,apps_morning_timeoflastuseall,apps_morning_frequencyentropyall,apps_morning_countall,apps_morning_timeoffirstuseemail,apps_morning_timeoflastuseemail,apps_morning_frequencyentropyemail,apps_morning_countemail,apps_morning_timeoffirstusesocial,apps_morning_timeoflastusesocial,apps_morning_frequencyentropysocial,apps_morning_countsocial,apps_morning_timeoffirstuseentertainment,apps_morning_timeoflastuseentertainment,apps_morning_frequencyentropyentertainment,apps_morning_countentertainment,apps_morning_timeoffirstusecom.facebook.moments,apps_morning_timeoflastusecom.facebook.moments,apps_morning_frequencyentropycom.facebook.moments,apps_morning_countcom.facebook.moments,apps_morning_timeoffirstusetop1global,apps_morning_timeoflastusetop1global,apps_morning_frequencyentropytop1global,apps_morning_counttop1global,apps_morning_timeoffirstusecom.google.android.youtube,apps_morning_timeoflastusecom.google.android.youtube,apps_morning_frequencyentropycom.google.android.youtube,apps_morning_countcom.google.android.youtube
-2020-07-05,412,719,0.9502705392332347,5,NA,NA,NA,0.0,427,427,NA,1,412,719,0.5623351446188083,4,NA,NA,NA,0.0,412,719,NA,3,NA,NA,NA,0.0
diff --git a/tests/data/processed/test01/applications_foreground_night.csv b/tests/data/processed/test01/applications_foreground_night.csv
deleted file mode 100644
index 2f086c94..00000000
--- a/tests/data/processed/test01/applications_foreground_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,apps_night_timeoffirstuseall,apps_night_timeoflastuseall,apps_night_frequencyentropyall,apps_night_countall,apps_night_timeoffirstuseemail,apps_night_timeoflastuseemail,apps_night_frequencyentropyemail,apps_night_countemail,apps_night_timeoffirstusesocial,apps_night_timeoflastusesocial,apps_night_frequencyentropysocial,apps_night_countsocial,apps_night_timeoffirstuseentertainment,apps_night_timeoflastuseentertainment,apps_night_frequencyentropyentertainment,apps_night_countentertainment,apps_night_timeoffirstusecom.facebook.moments,apps_night_timeoflastusecom.facebook.moments,apps_night_frequencyentropycom.facebook.moments,apps_night_countcom.facebook.moments,apps_night_timeoffirstusecom.google.android.youtube,apps_night_timeoflastusecom.google.android.youtube,apps_night_frequencyentropycom.google.android.youtube,apps_night_countcom.google.android.youtube,apps_night_timeoffirstusetop1global,apps_night_timeoflastusetop1global,apps_night_frequencyentropytop1global,apps_night_counttop1global
-2020-07-05,17,359,1.0549201679861442,5,NA,NA,NA,0.0,302,302,NA,1,195,359,NA,2,17,59,NA,2,NA,NA,NA,0.0,195,359,NA,2
diff --git a/tests/data/processed/test01/battery_afternoon.csv b/tests/data/processed/test01/battery_afternoon.csv
deleted file mode 100644
index 4544acf8..00000000
--- a/tests/data/processed/test01/battery_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_afternoon_countdischarge,battery_afternoon_sumdurationdischarge,battery_afternoon_avgconsumptionrate,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge
-2020-07-01,2,12.141000000000004,0.3148499579639538,0.3655119197498273,2,19.457666666666668
diff --git a/tests/data/processed/test01/battery_daily.csv b/tests/data/processed/test01/battery_daily.csv
deleted file mode 100644
index b69d3523..00000000
--- a/tests/data/processed/test01/battery_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_daily_countdischarge,battery_daily_sumdurationdischarge,battery_daily_avgconsumptionrate,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_sumdurationcharge
-2020-07-01,6,54.820549999999955,0.3388682207181443,0.4262039670118132,5,49.705000000000034
diff --git a/tests/data/processed/test01/battery_deltas.csv b/tests/data/processed/test01/battery_deltas.csv
deleted file mode 100644
index 71e63cf7..00000000
--- a/tests/data/processed/test01/battery_deltas.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
-3,9.46978333333333,"2020-07-01 00:08:10","2020-07-01 00:17:38","2020-07-01","2020-07-01","night","night"
--3,10.091,"2020-07-01 03:20:30","2020-07-01 03:30:35","2020-07-01","2020-07-01","night","night"
-3,7.03888333333333,"2020-07-01 05:57:30","2020-07-01 06:04:32","2020-07-01","2020-07-01","night","morning"
--3,8.591,"2020-07-01 08:04:32","2020-07-01 08:13:07","2020-07-01","2020-07-01","morning","morning"
-3,11.0243333333333,"2020-07-01 10:23:17","2020-07-01 10:34:18","2020-07-01","2020-07-01","morning","morning"
--3,12.1576666666667,"2020-07-01 11:55:58","2020-07-01 12:08:07","2020-07-01","2020-07-01","morning","afternoon"
-3,8.20766666666667,"2020-07-01 13:52:07","2020-07-01 14:00:19","2020-07-01","2020-07-01","afternoon","afternoon"
--3,11.341,"2020-07-01 16:13:27","2020-07-01 16:24:47","2020-07-01","2020-07-01","afternoon","afternoon"
-3,11.35555,"2020-07-01 17:56:03","2020-07-01 18:07:24","2020-07-01","2020-07-01","afternoon","evening"
--3,7.52433333333333,"2020-07-01 20:03:03","2020-07-01 20:10:34","2020-07-01","2020-07-01","evening","evening"
-3,7.72433333333333,"2020-07-01 21:30:04","2020-07-01 21:37:47","2020-07-01","2020-07-01","evening","evening"
diff --git a/tests/data/processed/test01/battery_evening.csv b/tests/data/processed/test01/battery_evening.csv
deleted file mode 100644
index d8dd2c3c..00000000
--- a/tests/data/processed/test01/battery_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_evening_countdischarge,battery_evening_sumdurationdischarge,battery_evening_avgconsumptionrate,battery_evening_maxconsumptionrate,battery_evening_countcharge,battery_evening_sumdurationcharge
-2020-07-01,2,15.12433333333333,0.3262855140774751,0.3883830319768698,1,7.52433333333333
diff --git a/tests/data/processed/test01/battery_morning.csv b/tests/data/processed/test01/battery_morning.csv
deleted file mode 100644
index 1bc5aa67..00000000
--- a/tests/data/processed/test01/battery_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_avgconsumptionrate,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_sumdurationcharge
-2020-07-01,2,15.557666666666634,0.3491646327968694,0.4262039670118131,2,12.607666666666667
diff --git a/tests/data/processed/test01/battery_night.csv b/tests/data/processed/test01/battery_night.csv
deleted file mode 100644
index 304297ec..00000000
--- a/tests/data/processed/test01/battery_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_night_countdischarge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationcharge
-2020-07-01,2,11.953116666666663,0.37150053891108137,0.4262039670118132,1,10.091000000000001
diff --git a/tests/data/processed/test01/bluetooth_afternoon.csv b/tests/data/processed/test01/bluetooth_afternoon.csv
deleted file mode 100644
index 931e4dc4..00000000
--- a/tests/data/processed/test01/bluetooth_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_afternoon_countscans","bluetooth_afternoon_uniquedevices","bluetooth_afternoon_countscansmostuniquedevice"
-"2020-07-02",2,2,1
diff --git a/tests/data/processed/test01/bluetooth_daily.csv b/tests/data/processed/test01/bluetooth_daily.csv
deleted file mode 100644
index ff814b87..00000000
--- a/tests/data/processed/test01/bluetooth_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_daily_countscans","bluetooth_daily_uniquedevices","bluetooth_daily_countscansmostuniquedevice"
-"2020-07-02",14,5,4
diff --git a/tests/data/processed/test01/bluetooth_evening.csv b/tests/data/processed/test01/bluetooth_evening.csv
deleted file mode 100644
index 28032ac8..00000000
--- a/tests/data/processed/test01/bluetooth_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_evening_countscans","bluetooth_evening_uniquedevices","bluetooth_evening_countscansmostuniquedevice"
-"2020-07-02",5,4,2
diff --git a/tests/data/processed/test01/bluetooth_morning.csv b/tests/data/processed/test01/bluetooth_morning.csv
deleted file mode 100644
index 09299dca..00000000
--- a/tests/data/processed/test01/bluetooth_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_morning_countscans","bluetooth_morning_uniquedevices","bluetooth_morning_countscansmostuniquedevice"
-"2020-07-02",3,2,2
diff --git a/tests/data/processed/test01/bluetooth_night.csv b/tests/data/processed/test01/bluetooth_night.csv
deleted file mode 100644
index 59486b18..00000000
--- a/tests/data/processed/test01/bluetooth_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_night_countscans","bluetooth_night_uniquedevices","bluetooth_night_countscansmostuniquedevice"
-"2020-07-02",4,4,1
diff --git a/tests/data/processed/test01/calls_incoming_afternoon.csv b/tests/data/processed/test01/calls_incoming_afternoon.csv
deleted file mode 100644
index 8c1e502a..00000000
--- a/tests/data/processed/test01/calls_incoming_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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,2,642.666666666667,1928,213,1053,420.333597673721,1053,0.941278069255821,753,921,2
diff --git a/tests/data/processed/test01/calls_incoming_daily.csv b/tests/data/processed/test01/calls_incoming_daily.csv
deleted file mode 100644
index f16631a0..00000000
--- a/tests/data/processed/test01/calls_incoming_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_incoming_evening.csv b/tests/data/processed/test01/calls_incoming_evening.csv
deleted file mode 100644
index 1ec1c738..00000000
--- a/tests/data/processed/test01/calls_incoming_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_incoming_morning.csv b/tests/data/processed/test01/calls_incoming_morning.csv
deleted file mode 100644
index bc94caa7..00000000
--- a/tests/data/processed/test01/calls_incoming_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_incoming_night.csv b/tests/data/processed/test01/calls_incoming_night.csv
deleted file mode 100644
index d3a404c2..00000000
--- a/tests/data/processed/test01/calls_incoming_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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,1,885,1770,439,1331,630.7392488184,439,0.560434787927257,163,257,2
diff --git a/tests/data/processed/test01/calls_missed_afternoon.csv b/tests/data/processed/test01/calls_missed_afternoon.csv
deleted file mode 100644
index 48a33476..00000000
--- a/tests/data/processed/test01/calls_missed_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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/test01/calls_missed_daily.csv b/tests/data/processed/test01/calls_missed_daily.csv
deleted file mode 100644
index 77d7e8ee..00000000
--- a/tests/data/processed/test01/calls_missed_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_missed_evening.csv b/tests/data/processed/test01/calls_missed_evening.csv
deleted file mode 100644
index c636f34c..00000000
--- a/tests/data/processed/test01/calls_missed_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_missed_morning.csv b/tests/data/processed/test01/calls_missed_morning.csv
deleted file mode 100644
index 36b37224..00000000
--- a/tests/data/processed/test01/calls_missed_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_missed_night.csv b/tests/data/processed/test01/calls_missed_night.csv
deleted file mode 100644
index 8359fafe..00000000
--- a/tests/data/processed/test01/calls_missed_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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,1,13,257,3
diff --git a/tests/data/processed/test01/calls_outgoing_afternoon.csv b/tests/data/processed/test01/calls_outgoing_afternoon.csv
deleted file mode 100644
index 0e8c6fa1..00000000
--- a/tests/data/processed/test01/calls_outgoing_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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/test01/calls_outgoing_daily.csv b/tests/data/processed/test01/calls_outgoing_daily.csv
deleted file mode 100644
index fe3a2fac..00000000
--- a/tests/data/processed/test01/calls_outgoing_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_outgoing_evening.csv b/tests/data/processed/test01/calls_outgoing_evening.csv
deleted file mode 100644
index 64aee2fe..00000000
--- a/tests/data/processed/test01/calls_outgoing_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_outgoing_morning.csv b/tests/data/processed/test01/calls_outgoing_morning.csv
deleted file mode 100644
index b4a3bdf7..00000000
--- a/tests/data/processed/test01/calls_outgoing_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_outgoing_night.csv b/tests/data/processed/test01/calls_outgoing_night.csv
deleted file mode 100644
index cb0303cb..00000000
--- a/tests/data/processed/test01/calls_outgoing_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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/test01/conversation_afternoon.csv b/tests/data/processed/test01/conversation_afternoon.csv
deleted file mode 100644
index a796d4f5..00000000
--- a/tests/data/processed/test01/conversation_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_afternoon_minutessilence,conversation_afternoon_minutesnoise,conversation_afternoon_minutesvoice,conversation_afternoon_minutesunknown,conversation_afternoon_countconversation,conversation_afternoon_silencesensedfraction,conversation_afternoon_noisesensedfraction,conversation_afternoon_voicesensedfraction,conversation_afternoon_unknownsensedfraction,conversation_afternoon_silenceexpectedfraction,conversation_afternoon_noiseexpectedfraction,conversation_afternoon_voiceexpectedfraction,conversation_afternoon_unknownexpectedfraction,conversation_afternoon_sumconversationduration,conversation_afternoon_avgconversationduration,conversation_afternoon_sdconversationduration,conversation_afternoon_minconversationduration,conversation_afternoon_maxconversationduration,conversation_afternoon_timefirstconversation,conversation_afternoon_timelastconversation,conversation_afternoon_sumenergy,conversation_afternoon_avgenergy,conversation_afternoon_sdenergy,conversation_afternoon_minenergy,conversation_afternoon_maxenergy
-2020-07-07,2.1333333333333333,27.416666666666668,8.266666666666667,1.8,5,0.05384938998737905,0.692048801009676,0.20866638620109385,0.045435422801851075,0.005925925925925926,0.07615740740740741,0.022962962962962966,0.005,12.437950003147126,2.4875900006294254,0.8690951001495368,1.780666669209798,3.9693833351135255,733.0,1038.0,11674618,4901.183039462637,3520.8178232562536,0,11997
diff --git a/tests/data/processed/test01/conversation_daily.csv b/tests/data/processed/test01/conversation_daily.csv
deleted file mode 100644
index f1299d13..00000000
--- a/tests/data/processed/test01/conversation_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_daily_minutessilence,conversation_daily_minutesnoise,conversation_daily_minutesvoice,conversation_daily_minutesunknown,conversation_daily_countconversation,conversation_daily_silencesensedfraction,conversation_daily_noisesensedfraction,conversation_daily_voicesensedfraction,conversation_daily_unknownsensedfraction,conversation_daily_silenceexpectedfraction,conversation_daily_noiseexpectedfraction,conversation_daily_voiceexpectedfraction,conversation_daily_unknownexpectedfraction,conversation_daily_sumconversationduration,conversation_daily_avgconversationduration,conversation_daily_sdconversationduration,conversation_daily_minconversationduration,conversation_daily_maxconversationduration,conversation_daily_timefirstconversation,conversation_daily_timelastconversation,conversation_daily_sumenergy,conversation_daily_avgenergy,conversation_daily_sdenergy,conversation_daily_minenergy,conversation_daily_maxenergy
-2020-07-07,3.7,50.63333333333333,15.066666666666666,3.683333333333333,14,0.05062713797035348,0.6928164196123148,0.206157354618016,0.05039908779931585,0.010277777777777778,0.14064814814814813,0.04185185185185185,0.01023148148148148,32.67243332862854,2.3337452377591816,2.374837824698354,0.7180166641871134,10.046433333555857,73.0,1436.0,21622427,4915.305069333939,3516.4999695807187,0,11997
diff --git a/tests/data/processed/test01/conversation_evening.csv b/tests/data/processed/test01/conversation_evening.csv
deleted file mode 100644
index f864ecda..00000000
--- a/tests/data/processed/test01/conversation_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_evening_minutessilence,conversation_evening_minutesnoise,conversation_evening_minutesvoice,conversation_evening_minutesunknown,conversation_evening_countconversation,conversation_evening_silencesensedfraction,conversation_evening_noisesensedfraction,conversation_evening_voicesensedfraction,conversation_evening_unknownsensedfraction,conversation_evening_silenceexpectedfraction,conversation_evening_noiseexpectedfraction,conversation_evening_voiceexpectedfraction,conversation_evening_unknownexpectedfraction,conversation_evening_sumconversationduration,conversation_evening_avgconversationduration,conversation_evening_sdconversationduration,conversation_evening_minconversationduration,conversation_evening_maxconversationduration,conversation_evening_timefirstconversation,conversation_evening_timelastconversation,conversation_evening_sumenergy,conversation_evening_avgenergy,conversation_evening_sdenergy,conversation_evening_minenergy,conversation_evening_maxenergy
-2020-07-07,0.36666666666666664,4.65,1.5166666666666666,0.4166666666666667,3,0.05275779376498801,0.6690647482014389,0.21822541966426856,0.05995203836930456,0.0010185185185185184,0.012916666666666668,0.004212962962962963,0.0011574074074074076,4.880700000127156,1.6269000000423854,0.44788788134076357,1.3510499993960063,2.1436833341916404,1204.0,1436.0,1989527,4736.969047619048,3421.199118663052,0,11997
diff --git a/tests/data/processed/test01/conversation_morning.csv b/tests/data/processed/test01/conversation_morning.csv
deleted file mode 100644
index cac19c3f..00000000
--- a/tests/data/processed/test01/conversation_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_morning_minutessilence,conversation_morning_minutesnoise,conversation_morning_minutesvoice,conversation_morning_minutesunknown,conversation_morning_countconversation,conversation_morning_silencesensedfraction,conversation_morning_noisesensedfraction,conversation_morning_voicesensedfraction,conversation_morning_unknownsensedfraction,conversation_morning_silenceexpectedfraction,conversation_morning_noiseexpectedfraction,conversation_morning_voiceexpectedfraction,conversation_morning_unknownexpectedfraction,conversation_morning_sumconversationduration,conversation_morning_avgconversationduration,conversation_morning_sdconversationduration,conversation_morning_minconversationduration,conversation_morning_maxconversationduration,conversation_morning_timefirstconversation,conversation_morning_timelastconversation,conversation_morning_sumenergy,conversation_morning_avgenergy,conversation_morning_sdenergy,conversation_morning_minenergy,conversation_morning_maxenergy
-2020-07-07,0.5,8.266666666666667,2.433333333333333,0.65,4,0.04219409282700422,0.6976090014064699,0.20534458509142053,0.05485232067510549,0.001388888888888889,0.022962962962962966,0.006759259259259258,0.0018055555555555557,4.589333327611287,1.1473333319028218,0.42892803694050957,0.749316664536794,1.6650999983151753,392.0,656.0,3535623,4944.927272727273,3443.3314096066924,0,11985
diff --git a/tests/data/processed/test01/conversation_night.csv b/tests/data/processed/test01/conversation_night.csv
deleted file mode 100644
index 876fb780..00000000
--- a/tests/data/processed/test01/conversation_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_night_minutessilence,conversation_night_minutesnoise,conversation_night_minutesvoice,conversation_night_minutesunknown,conversation_night_countconversation,conversation_night_silencesensedfraction,conversation_night_noisesensedfraction,conversation_night_voicesensedfraction,conversation_night_unknownsensedfraction,conversation_night_silenceexpectedfraction,conversation_night_noiseexpectedfraction,conversation_night_voiceexpectedfraction,conversation_night_unknownexpectedfraction,conversation_night_sumconversationduration,conversation_night_avgconversationduration,conversation_night_sdconversationduration,conversation_night_minconversationduration,conversation_night_maxconversationduration,conversation_night_timefirstconversation,conversation_night_timelastconversation,conversation_night_sumenergy,conversation_night_avgenergy,conversation_night_sdenergy,conversation_night_minenergy,conversation_night_maxenergy
-2020-07-07,0.7,10.3,2.85,0.8166666666666667,2,0.04772727272727273,0.7022727272727274,0.19431818181818183,0.055681818181818186,0.0019444444444444444,0.02861111111111111,0.007916666666666667,0.0022685185185185187,10.76444999774297,5.382224998871485,6.596186684644267,0.7180166641871134,10.046433333555857,73.0,359.0,4422659,5014.35260770975,3609.249684373919,0,11976
diff --git a/tests/data/processed/test01/light_afternoon.csv b/tests/data/processed/test01/light_afternoon.csv
deleted file mode 100644
index 1ba407f5..00000000
--- a/tests/data/processed/test01/light_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,light_afternoon_count,light_afternoon_maxlux,light_afternoon_minlux,light_afternoon_avglux,light_afternoon_medianlux,light_afternoon_stdlux
-2020-07-04,4,97656.0,10351.0,55761.5,57519.5,44778.68551368311
diff --git a/tests/data/processed/test01/light_daily.csv b/tests/data/processed/test01/light_daily.csv
deleted file mode 100644
index de186382..00000000
--- a/tests/data/processed/test01/light_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,light_daily_count,light_daily_maxlux,light_daily_minlux,light_daily_avglux,light_daily_medianlux,light_daily_stdlux
-2020-07-04,12,114615.0,0.065,40207.89508333333,19836.0,44686.69422566498
diff --git a/tests/data/processed/test01/light_evening.csv b/tests/data/processed/test01/light_evening.csv
deleted file mode 100644
index 93f958a7..00000000
--- a/tests/data/processed/test01/light_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,light_evening_count,light_evening_maxlux,light_evening_minlux,light_evening_avglux,light_evening_medianlux,light_evening_stdlux
-2020-07-04,3,15258.0,84.156,5603.718666666667,1469.0,8389.476102441995
diff --git a/tests/data/processed/test01/light_morning.csv b/tests/data/processed/test01/light_morning.csv
deleted file mode 100644
index 867c142b..00000000
--- a/tests/data/processed/test01/light_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,light_morning_count,light_morning_maxlux,light_morning_minlux,light_morning_avglux,light_morning_medianlux,light_morning_stdlux
-2020-07-04,4,114615.0,472.52,60659.38,63775.0,51510.58234386665
diff --git a/tests/data/processed/test01/light_night.csv b/tests/data/processed/test01/light_night.csv
deleted file mode 100644
index ef38d120..00000000
--- a/tests/data/processed/test01/light_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,light_night_count,light_night_maxlux,light_night_minlux,light_night_avglux,light_night_medianlux,light_night_stdlux
-2020-07-04,1,0.065,0.065,0.065,0.065,NA
diff --git a/tests/data/processed/test01/messages_received_afternoon.csv b/tests/data/processed/test01/messages_received_afternoon.csv
deleted file mode 100644
index 10344957..00000000
--- a/tests/data/processed/test01/messages_received_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_received_afternoon_countmostfrequentcontact","messages_received_afternoon_count","messages_received_afternoon_distinctcontacts","messages_received_afternoon_timefirstmessage","messages_received_afternoon_timelastmessage"
-"2020-05-28",1,2,2,830,949
diff --git a/tests/data/processed/test01/messages_received_daily.csv b/tests/data/processed/test01/messages_received_daily.csv
deleted file mode 100644
index b3db335e..00000000
--- a/tests/data/processed/test01/messages_received_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_daily_countmostfrequentcontact","messages_received_daily_count","messages_received_daily_distinctcontacts","messages_received_daily_timefirstmessage","messages_received_daily_timelastmessage"
-"2020-05-28",7,12,6,6,1382
-"2020-05-29",3,6,4,401,1382
diff --git a/tests/data/processed/test01/messages_received_evening.csv b/tests/data/processed/test01/messages_received_evening.csv
deleted file mode 100644
index 2791e326..00000000
--- a/tests/data/processed/test01/messages_received_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_evening_countmostfrequentcontact","messages_received_evening_count","messages_received_evening_distinctcontacts","messages_received_evening_timefirstmessage","messages_received_evening_timelastmessage"
-"2020-05-28",2,3,2,1173,1382
-"2020-05-29",2,3,2,1173,1382
diff --git a/tests/data/processed/test01/messages_received_morning.csv b/tests/data/processed/test01/messages_received_morning.csv
deleted file mode 100644
index 2aab40a6..00000000
--- a/tests/data/processed/test01/messages_received_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_morning_countmostfrequentcontact","messages_received_morning_count","messages_received_morning_distinctcontacts","messages_received_morning_timefirstmessage","messages_received_morning_timelastmessage"
-"2020-05-28",1,3,3,401,660
-"2020-05-29",1,3,3,401,660
diff --git a/tests/data/processed/test01/messages_received_night.csv b/tests/data/processed/test01/messages_received_night.csv
deleted file mode 100644
index 84a53e1b..00000000
--- a/tests/data/processed/test01/messages_received_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_received_night_countmostfrequentcontact","messages_received_night_count","messages_received_night_distinctcontacts","messages_received_night_timefirstmessage","messages_received_night_timelastmessage"
-"2020-05-28",4,4,1,6,312
diff --git a/tests/data/processed/test01/messages_sent_afternoon.csv b/tests/data/processed/test01/messages_sent_afternoon.csv
deleted file mode 100644
index 1ac41cd2..00000000
--- a/tests/data/processed/test01/messages_sent_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_sent_afternoon_countmostfrequentcontact","messages_sent_afternoon_count","messages_sent_afternoon_distinctcontacts","messages_sent_afternoon_timefirstmessage","messages_sent_afternoon_timelastmessage"
-"2020-05-28",1,3,3,722,979
diff --git a/tests/data/processed/test01/messages_sent_daily.csv b/tests/data/processed/test01/messages_sent_daily.csv
deleted file mode 100644
index b6d423ea..00000000
--- a/tests/data/processed/test01/messages_sent_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_daily_countmostfrequentcontact","messages_sent_daily_count","messages_sent_daily_distinctcontacts","messages_sent_daily_timefirstmessage","messages_sent_daily_timelastmessage"
-"2020-05-28",3,8,6,219,1401
-"2020-05-29",1,4,4,388,1401
diff --git a/tests/data/processed/test01/messages_sent_evening.csv b/tests/data/processed/test01/messages_sent_evening.csv
deleted file mode 100644
index b5a38e27..00000000
--- a/tests/data/processed/test01/messages_sent_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_evening_countmostfrequentcontact","messages_sent_evening_count","messages_sent_evening_distinctcontacts","messages_sent_evening_timefirstmessage","messages_sent_evening_timelastmessage"
-"2020-05-28",1,2,2,1218,1401
-"2020-05-29",1,2,2,1218,1401
diff --git a/tests/data/processed/test01/messages_sent_morning.csv b/tests/data/processed/test01/messages_sent_morning.csv
deleted file mode 100644
index a3d3fb5e..00000000
--- a/tests/data/processed/test01/messages_sent_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_morning_countmostfrequentcontact","messages_sent_morning_count","messages_sent_morning_distinctcontacts","messages_sent_morning_timefirstmessage","messages_sent_morning_timelastmessage"
-"2020-05-28",1,2,2,388,654
-"2020-05-29",1,2,2,388,654
diff --git a/tests/data/processed/test01/messages_sent_night.csv b/tests/data/processed/test01/messages_sent_night.csv
deleted file mode 100644
index bbabc406..00000000
--- a/tests/data/processed/test01/messages_sent_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_sent_night_countmostfrequentcontact","messages_sent_night_count","messages_sent_night_distinctcontacts","messages_sent_night_timefirstmessage","messages_sent_night_timelastmessage"
-"2020-05-28",1,1,1,219,219
diff --git a/tests/data/processed/test01/screen_afternoon.csv b/tests/data/processed/test01/screen_afternoon.csv
deleted file mode 100644
index 868d0364..00000000
--- a/tests/data/processed/test01/screen_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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.06,30.08298333333333,12.55,8.533333333333333,10.02766111111111,2.1968176781889985,720.0
diff --git a/tests/data/processed/test01/screen_daily.csv b/tests/data/processed/test01/screen_daily.csv
deleted file mode 100644
index 393d7794..00000000
--- a/tests/data/processed/test01/screen_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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.04,94.60658333333333,21.6598833333333,5.9910166666666695,13.51522619047619,6.19241804679586,170.5
diff --git a/tests/data/processed/test01/screen_deltas.csv b/tests/data/processed/test01/screen_deltas.csv
deleted file mode 100644
index c4d8eb2e..00000000
--- a/tests/data/processed/test01/screen_deltas.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-"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"
-3,"unlock","3, 0",5.99101666666667,"2020-06-01 02:50:30","2020-06-01 02:56:30","2020-06-01","2020-06-01","night","night"
-7,"unlock","3, 0",6.99016666666667,"2020-06-01 05:56:51","2020-06-01 06:03:51","2020-06-01","2020-06-01","night","morning"
-11,"unlock","3, 0",21.6598833333333,"2020-06-01 10:00:24","2020-06-01 10:22:04","2020-06-01","2020-06-01","morning","morning"
-15,"unlock","3, 0",14.9953833333333,"2020-06-01 11:57:33","2020-06-01 12:12:33","2020-06-01","2020-06-01","morning","afternoon"
-19,"unlock","3, 0",8.99965,"2020-06-01 14:51:02","2020-06-01 15:00:02","2020-06-01","2020-06-01","afternoon","afternoon"
-23,"unlock","3, 0",16.9834166666667,"2020-06-01 17:51:27","2020-06-01 18:08:26","2020-06-01","2020-06-01","afternoon","evening"
-27,"unlock","3, 0",18.9870666666667,"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/test01/screen_evening.csv b/tests/data/processed/test01/screen_evening.csv
deleted file mode 100644
index f23670da..00000000
--- a/tests/data/processed/test01/screen_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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.044444444444444446,27.420400000000033,18.9870666666667,8.433333333333334,13.710200000000016,7.462616406834528,1080.0
diff --git a/tests/data/processed/test01/screen_morning.csv b/tests/data/processed/test01/screen_morning.csv
deleted file mode 100644
index 9da7a42e..00000000
--- a/tests/data/processed/test01/screen_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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.06666666666666667,27.943216666666636,21.6598833333333,2.433333333333333,9.314405555555545,10.714935943920263,360.0
diff --git a/tests/data/processed/test01/screen_night.csv b/tests/data/processed/test01/screen_night.csv
deleted file mode 100644
index f4ba3ad6..00000000
--- a/tests/data/processed/test01/screen_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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.05714285714285714,9.124350000000003,5.9910166666666695,3.1333333333333333,4.562175000000002,2.0206872634837794,170.5
diff --git a/tests/data/processed/test01/wifi_afternoon.csv b/tests/data/processed/test01/wifi_afternoon.csv
deleted file mode 100644
index 2c670e59..00000000
--- a/tests/data/processed/test01/wifi_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_afternoon_countscans","wifi_afternoon_uniquedevices","wifi_afternoon_countscansmostuniquedevice"
-"2020-07-03",4,4,1
diff --git a/tests/data/processed/test01/wifi_daily.csv b/tests/data/processed/test01/wifi_daily.csv
deleted file mode 100644
index 66cb5e2a..00000000
--- a/tests/data/processed/test01/wifi_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_daily_countscans","wifi_daily_uniquedevices","wifi_daily_countscansmostuniquedevice"
-"2020-07-03",26,10,6
diff --git a/tests/data/processed/test01/wifi_evening.csv b/tests/data/processed/test01/wifi_evening.csv
deleted file mode 100644
index e63ca233..00000000
--- a/tests/data/processed/test01/wifi_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_evening_countscans","wifi_evening_uniquedevices","wifi_evening_countscansmostuniquedevice"
-"2020-07-03",7,6,2
diff --git a/tests/data/processed/test01/wifi_morning.csv b/tests/data/processed/test01/wifi_morning.csv
deleted file mode 100644
index 2359f24e..00000000
--- a/tests/data/processed/test01/wifi_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_morning_countscans","wifi_morning_uniquedevices","wifi_morning_countscansmostuniquedevice"
-"2020-07-03",7,5,2
diff --git a/tests/data/processed/test01/wifi_night.csv b/tests/data/processed/test01/wifi_night.csv
deleted file mode 100644
index 89fef7fb..00000000
--- a/tests/data/processed/test01/wifi_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_night_countscans","wifi_night_uniquedevices","wifi_night_countscansmostuniquedevice"
-"2020-07-03",8,6,2
diff --git a/tests/data/processed/test02/activity_recognition_afternoon.csv b/tests/data/processed/test02/activity_recognition_afternoon.csv
deleted file mode 100644
index a9fa65eb..00000000
--- a/tests/data/processed/test02/activity_recognition_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_afternoon_count,ar_afternoon_mostcommonactivity,ar_afternoon_countuniqueactivities,ar_afternoon_activitychangecount,ar_afternoon_sumstationary,ar_afternoon_summobile,ar_afternoon_sumvehicle
-2020-07-06,11,0,3,2,91.4326,60.46666666666667,25.433333333333334
diff --git a/tests/data/processed/test02/activity_recognition_daily.csv b/tests/data/processed/test02/activity_recognition_daily.csv
deleted file mode 100644
index 73ae19db..00000000
--- a/tests/data/processed/test02/activity_recognition_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_daily_count,ar_daily_mostcommonactivity,ar_daily_countuniqueactivities,ar_daily_activitychangecount,ar_daily_sumstationary,ar_daily_summobile,ar_daily_sumvehicle
-2020-07-06,49,2,4,9,501.1613166666666,334.0321000000003,70.3941833333333
diff --git a/tests/data/processed/test02/activity_recognition_evening.csv b/tests/data/processed/test02/activity_recognition_evening.csv
deleted file mode 100644
index ee8ecd91..00000000
--- a/tests/data/processed/test02/activity_recognition_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_evening_count,ar_evening_mostcommonactivity,ar_evening_countuniqueactivities,ar_evening_activitychangecount,ar_evening_sumstationary,ar_evening_summobile,ar_evening_sumvehicle
-2020-07-06,16,2,4,4,7.609966666666669,120.1363,13.033333333333333
diff --git a/tests/data/processed/test02/activity_recognition_morning.csv b/tests/data/processed/test02/activity_recognition_morning.csv
deleted file mode 100644
index e58fb2b0..00000000
--- a/tests/data/processed/test02/activity_recognition_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_morning_count,ar_morning_mostcommonactivity,ar_morning_countuniqueactivities,ar_morning_activitychangecount,ar_morning_sumstationary,ar_morning_summobile,ar_morning_sumvehicle
-2020-07-06,17,2,3,3,46.0,153.41488333333368,31.9119
diff --git a/tests/data/processed/test02/activity_recognition_night.csv b/tests/data/processed/test02/activity_recognition_night.csv
deleted file mode 100644
index 7743c271..00000000
--- a/tests/data/processed/test02/activity_recognition_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,ar_night_count,ar_night_mostcommonactivity,ar_night_countuniqueactivities,ar_night_activitychangecount,ar_night_sumstationary,ar_night_summobile,ar_night_sumvehicle
-2020-07-06,5,3,1,0,356.1,0,0
diff --git a/tests/data/processed/test02/applications_foreground_afternoon.csv b/tests/data/processed/test02/applications_foreground_afternoon.csv
deleted file mode 100644
index 36c73188..00000000
--- a/tests/data/processed/test02/applications_foreground_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_afternoon_countemail,apps_afternoon_countall,apps_afternoon_countentertainment,apps_afternoon_countsocial,apps_afternoon_countcom.facebook.moments,apps_afternoon_countcom.google.android.youtube,apps_afternoon_counttop1global,apps_afternoon_timeoffirstuseemail,apps_afternoon_timeoffirstuseall,apps_afternoon_timeoffirstuseentertainment,apps_afternoon_timeoffirstusesocial,apps_afternoon_timeoffirstusecom.facebook.moments,apps_afternoon_timeoffirstusecom.google.android.youtube,apps_afternoon_timeoffirstusetop1global,apps_afternoon_timeoflastuseemail,apps_afternoon_timeoflastuseall,apps_afternoon_timeoflastuseentertainment,apps_afternoon_timeoflastusesocial,apps_afternoon_timeoflastusecom.facebook.moments,apps_afternoon_timeoflastusecom.google.android.youtube,apps_afternoon_timeoflastusetop1global,apps_afternoon_frequencyentropyemail,apps_afternoon_frequencyentropyall,apps_afternoon_frequencyentropyentertainment,apps_afternoon_frequencyentropysocial,apps_afternoon_frequencyentropycom.facebook.moments,apps_afternoon_frequencyentropycom.google.android.youtube,apps_afternoon_frequencyentropytop1global
diff --git a/tests/data/processed/test02/applications_foreground_daily.csv b/tests/data/processed/test02/applications_foreground_daily.csv
deleted file mode 100644
index 444dcbd7..00000000
--- a/tests/data/processed/test02/applications_foreground_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_daily_countall,apps_daily_countemail,apps_daily_countentertainment,apps_daily_countsocial,apps_daily_countcom.facebook.moments,apps_daily_countcom.google.android.youtube,apps_daily_counttop1global,apps_daily_timeoffirstuseall,apps_daily_timeoffirstuseemail,apps_daily_timeoffirstuseentertainment,apps_daily_timeoffirstusesocial,apps_daily_timeoffirstusecom.facebook.moments,apps_daily_timeoffirstusecom.google.android.youtube,apps_daily_timeoffirstusetop1global,apps_daily_timeoflastuseall,apps_daily_timeoflastuseemail,apps_daily_timeoflastuseentertainment,apps_daily_timeoflastusesocial,apps_daily_timeoflastusecom.facebook.moments,apps_daily_timeoflastusecom.google.android.youtube,apps_daily_timeoflastusetop1global,apps_daily_frequencyentropyall,apps_daily_frequencyentropyemail,apps_daily_frequencyentropyentertainment,apps_daily_frequencyentropysocial,apps_daily_frequencyentropycom.facebook.moments,apps_daily_frequencyentropycom.google.android.youtube,apps_daily_frequencyentropytop1global
diff --git a/tests/data/processed/test02/applications_foreground_evening.csv b/tests/data/processed/test02/applications_foreground_evening.csv
deleted file mode 100644
index 3a6bc42e..00000000
--- a/tests/data/processed/test02/applications_foreground_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_evening_countemail,apps_evening_countall,apps_evening_countsocial,apps_evening_countentertainment,apps_evening_counttop1global,apps_evening_countcom.facebook.moments,apps_evening_countcom.google.android.youtube,apps_evening_timeoffirstuseemail,apps_evening_timeoffirstuseall,apps_evening_timeoffirstusesocial,apps_evening_timeoffirstuseentertainment,apps_evening_timeoffirstusetop1global,apps_evening_timeoffirstusecom.facebook.moments,apps_evening_timeoffirstusecom.google.android.youtube,apps_evening_timeoflastuseemail,apps_evening_timeoflastuseall,apps_evening_timeoflastusesocial,apps_evening_timeoflastuseentertainment,apps_evening_timeoflastusetop1global,apps_evening_timeoflastusecom.facebook.moments,apps_evening_timeoflastusecom.google.android.youtube,apps_evening_frequencyentropyemail,apps_evening_frequencyentropyall,apps_evening_frequencyentropysocial,apps_evening_frequencyentropyentertainment,apps_evening_frequencyentropytop1global,apps_evening_frequencyentropycom.facebook.moments,apps_evening_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test02/applications_foreground_morning.csv b/tests/data/processed/test02/applications_foreground_morning.csv
deleted file mode 100644
index 12158188..00000000
--- a/tests/data/processed/test02/applications_foreground_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_morning_countemail,apps_morning_countall,apps_morning_countentertainment,apps_morning_countsocial,apps_morning_counttop1global,apps_morning_countcom.google.android.youtube,apps_morning_countcom.facebook.moments,apps_morning_timeoffirstuseemail,apps_morning_timeoffirstuseall,apps_morning_timeoffirstuseentertainment,apps_morning_timeoffirstusesocial,apps_morning_timeoffirstusetop1global,apps_morning_timeoffirstusecom.google.android.youtube,apps_morning_timeoffirstusecom.facebook.moments,apps_morning_timeoflastuseemail,apps_morning_timeoflastuseall,apps_morning_timeoflastuseentertainment,apps_morning_timeoflastusesocial,apps_morning_timeoflastusetop1global,apps_morning_timeoflastusecom.google.android.youtube,apps_morning_timeoflastusecom.facebook.moments,apps_morning_frequencyentropyemail,apps_morning_frequencyentropyall,apps_morning_frequencyentropyentertainment,apps_morning_frequencyentropysocial,apps_morning_frequencyentropytop1global,apps_morning_frequencyentropycom.google.android.youtube,apps_morning_frequencyentropycom.facebook.moments
diff --git a/tests/data/processed/test02/applications_foreground_night.csv b/tests/data/processed/test02/applications_foreground_night.csv
deleted file mode 100644
index 2b589972..00000000
--- a/tests/data/processed/test02/applications_foreground_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_night_countall,apps_night_countemail,apps_night_countentertainment,apps_night_countsocial,apps_night_countcom.google.android.youtube,apps_night_counttop1global,apps_night_countcom.facebook.moments,apps_night_timeoffirstuseall,apps_night_timeoffirstuseemail,apps_night_timeoffirstuseentertainment,apps_night_timeoffirstusesocial,apps_night_timeoffirstusecom.google.android.youtube,apps_night_timeoffirstusetop1global,apps_night_timeoffirstusecom.facebook.moments,apps_night_timeoflastuseall,apps_night_timeoflastuseemail,apps_night_timeoflastuseentertainment,apps_night_timeoflastusesocial,apps_night_timeoflastusecom.google.android.youtube,apps_night_timeoflastusetop1global,apps_night_timeoflastusecom.facebook.moments,apps_night_frequencyentropyall,apps_night_frequencyentropyemail,apps_night_frequencyentropyentertainment,apps_night_frequencyentropysocial,apps_night_frequencyentropycom.google.android.youtube,apps_night_frequencyentropytop1global,apps_night_frequencyentropycom.facebook.moments
diff --git a/tests/data/processed/test02/battery_afternoon.csv b/tests/data/processed/test02/battery_afternoon.csv
deleted file mode 100644
index 4544acf8..00000000
--- a/tests/data/processed/test02/battery_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_afternoon_countdischarge,battery_afternoon_sumdurationdischarge,battery_afternoon_avgconsumptionrate,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge
-2020-07-01,2,12.141000000000004,0.3148499579639538,0.3655119197498273,2,19.457666666666668
diff --git a/tests/data/processed/test02/battery_daily.csv b/tests/data/processed/test02/battery_daily.csv
deleted file mode 100644
index b69d3523..00000000
--- a/tests/data/processed/test02/battery_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_daily_countdischarge,battery_daily_sumdurationdischarge,battery_daily_avgconsumptionrate,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_sumdurationcharge
-2020-07-01,6,54.820549999999955,0.3388682207181443,0.4262039670118132,5,49.705000000000034
diff --git a/tests/data/processed/test02/battery_deltas.csv b/tests/data/processed/test02/battery_deltas.csv
deleted file mode 100644
index 71e63cf7..00000000
--- a/tests/data/processed/test02/battery_deltas.csv
+++ /dev/null
@@ -1,12 +0,0 @@
-"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
-3,9.46978333333333,"2020-07-01 00:08:10","2020-07-01 00:17:38","2020-07-01","2020-07-01","night","night"
--3,10.091,"2020-07-01 03:20:30","2020-07-01 03:30:35","2020-07-01","2020-07-01","night","night"
-3,7.03888333333333,"2020-07-01 05:57:30","2020-07-01 06:04:32","2020-07-01","2020-07-01","night","morning"
--3,8.591,"2020-07-01 08:04:32","2020-07-01 08:13:07","2020-07-01","2020-07-01","morning","morning"
-3,11.0243333333333,"2020-07-01 10:23:17","2020-07-01 10:34:18","2020-07-01","2020-07-01","morning","morning"
--3,12.1576666666667,"2020-07-01 11:55:58","2020-07-01 12:08:07","2020-07-01","2020-07-01","morning","afternoon"
-3,8.20766666666667,"2020-07-01 13:52:07","2020-07-01 14:00:19","2020-07-01","2020-07-01","afternoon","afternoon"
--3,11.341,"2020-07-01 16:13:27","2020-07-01 16:24:47","2020-07-01","2020-07-01","afternoon","afternoon"
-3,11.35555,"2020-07-01 17:56:03","2020-07-01 18:07:24","2020-07-01","2020-07-01","afternoon","evening"
--3,7.52433333333333,"2020-07-01 20:03:03","2020-07-01 20:10:34","2020-07-01","2020-07-01","evening","evening"
-3,7.72433333333333,"2020-07-01 21:30:04","2020-07-01 21:37:47","2020-07-01","2020-07-01","evening","evening"
diff --git a/tests/data/processed/test02/battery_evening.csv b/tests/data/processed/test02/battery_evening.csv
deleted file mode 100644
index d8dd2c3c..00000000
--- a/tests/data/processed/test02/battery_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_evening_countdischarge,battery_evening_sumdurationdischarge,battery_evening_avgconsumptionrate,battery_evening_maxconsumptionrate,battery_evening_countcharge,battery_evening_sumdurationcharge
-2020-07-01,2,15.12433333333333,0.3262855140774751,0.3883830319768698,1,7.52433333333333
diff --git a/tests/data/processed/test02/battery_morning.csv b/tests/data/processed/test02/battery_morning.csv
deleted file mode 100644
index 1bc5aa67..00000000
--- a/tests/data/processed/test02/battery_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_avgconsumptionrate,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_sumdurationcharge
-2020-07-01,2,15.557666666666634,0.3491646327968694,0.4262039670118131,2,12.607666666666667
diff --git a/tests/data/processed/test02/battery_night.csv b/tests/data/processed/test02/battery_night.csv
deleted file mode 100644
index 304297ec..00000000
--- a/tests/data/processed/test02/battery_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,battery_night_countdischarge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationcharge
-2020-07-01,2,11.953116666666663,0.37150053891108137,0.4262039670118132,1,10.091000000000001
diff --git a/tests/data/processed/test02/bluetooth_afternoon.csv b/tests/data/processed/test02/bluetooth_afternoon.csv
deleted file mode 100644
index 931e4dc4..00000000
--- a/tests/data/processed/test02/bluetooth_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_afternoon_countscans","bluetooth_afternoon_uniquedevices","bluetooth_afternoon_countscansmostuniquedevice"
-"2020-07-02",2,2,1
diff --git a/tests/data/processed/test02/bluetooth_daily.csv b/tests/data/processed/test02/bluetooth_daily.csv
deleted file mode 100644
index c1538fd7..00000000
--- a/tests/data/processed/test02/bluetooth_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_daily_countscans","bluetooth_daily_uniquedevices","bluetooth_daily_countscansmostuniquedevice"
-"2020-07-02",14,5,5
diff --git a/tests/data/processed/test02/bluetooth_evening.csv b/tests/data/processed/test02/bluetooth_evening.csv
deleted file mode 100644
index 4b8d6c55..00000000
--- a/tests/data/processed/test02/bluetooth_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_evening_countscans","bluetooth_evening_uniquedevices","bluetooth_evening_countscansmostuniquedevice"
-"2020-07-02",5,3,3
diff --git a/tests/data/processed/test02/bluetooth_morning.csv b/tests/data/processed/test02/bluetooth_morning.csv
deleted file mode 100644
index b2d37fd0..00000000
--- a/tests/data/processed/test02/bluetooth_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_morning_countscans","bluetooth_morning_uniquedevices","bluetooth_morning_countscansmostuniquedevice"
-"2020-07-02",3,3,1
diff --git a/tests/data/processed/test02/bluetooth_night.csv b/tests/data/processed/test02/bluetooth_night.csv
deleted file mode 100644
index 4887dbaa..00000000
--- a/tests/data/processed/test02/bluetooth_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","bluetooth_night_countscans","bluetooth_night_uniquedevices","bluetooth_night_countscansmostuniquedevice"
-"2020-07-02",4,2,2
diff --git a/tests/data/processed/test02/calls_incoming_afternoon.csv b/tests/data/processed/test02/calls_incoming_afternoon.csv
deleted file mode 100644
index 9d4635bf..00000000
--- a/tests/data/processed/test02/calls_incoming_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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,629.333333333333,1888,198,1040,421.38027164704,1040,0.932593293857646,753,921,1
diff --git a/tests/data/processed/test02/calls_incoming_daily.csv b/tests/data/processed/test02/calls_incoming_daily.csv
deleted file mode 100644
index 994563cf..00000000
--- a/tests/data/processed/test02/calls_incoming_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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,961.4,9614,198,1700,464.326800624062,420,2.18431625877259,163,1331,1
-"2020-06-02",5,5,1202,6010,660,1710,375.326524508993,660,1.56885323664414,519,1331,0
diff --git a/tests/data/processed/test02/calls_incoming_evening.csv b/tests/data/processed/test02/calls_incoming_evening.csv
deleted file mode 100644
index 37331ec6..00000000
--- a/tests/data/processed/test02/calls_incoming_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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,1350,4050,1140,1700,305.122926047847,1140,1.08239814505043,1144,1331,1
-"2020-06-02",3,3,1353.33333333333,4060,1140,1710,310.859024854247,1140,1.08186609729599,1144,1331,0
diff --git a/tests/data/processed/test02/calls_incoming_morning.csv b/tests/data/processed/test02/calls_incoming_morning.csv
deleted file mode 100644
index 413e0506..00000000
--- a/tests/data/processed/test02/calls_incoming_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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,968,1936,657,1279,439.820417898033,657,0.640867990789142,519,600,1
-"2020-06-02",2,2,975,1950,660,1290,445.477272147525,660,0.640266157864261,519,600,0
diff --git a/tests/data/processed/test02/calls_incoming_night.csv b/tests/data/processed/test02/calls_incoming_night.csv
deleted file mode 100644
index a73428ad..00000000
--- a/tests/data/processed/test02/calls_incoming_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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,870,1740,420,1320,636.396103067893,420,0.552951978816239,163,257,1
diff --git a/tests/data/processed/test02/calls_missed_afternoon.csv b/tests/data/processed/test02/calls_missed_afternoon.csv
deleted file mode 100644
index 7b1d275f..00000000
--- a/tests/data/processed/test02/calls_missed_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_afternoon_count","call_missed_afternoon_distinctcontacts","call_missed_afternoon_timefirstcall","call_missed_afternoon_timelastcall","call_missed_afternoon_countmostfrequentcontact"
diff --git a/tests/data/processed/test02/calls_missed_daily.csv b/tests/data/processed/test02/calls_missed_daily.csv
deleted file mode 100644
index 677ee442..00000000
--- a/tests/data/processed/test02/calls_missed_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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",3,3,13,1167,1
-"2020-06-02",1,1,589,589,0
diff --git a/tests/data/processed/test02/calls_missed_evening.csv b/tests/data/processed/test02/calls_missed_evening.csv
deleted file mode 100644
index 290cf82b..00000000
--- a/tests/data/processed/test02/calls_missed_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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
diff --git a/tests/data/processed/test02/calls_missed_morning.csv b/tests/data/processed/test02/calls_missed_morning.csv
deleted file mode 100644
index 4d35ed4b..00000000
--- a/tests/data/processed/test02/calls_missed_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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/calls_missed_night.csv b/tests/data/processed/test02/calls_missed_night.csv
deleted file mode 100644
index ac1c9e25..00000000
--- a/tests/data/processed/test02/calls_missed_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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",1,1,13,13,1
diff --git a/tests/data/processed/test02/calls_outgoing_afternoon.csv b/tests/data/processed/test02/calls_outgoing_afternoon.csv
deleted file mode 100644
index 5f91c20c..00000000
--- a/tests/data/processed/test02/calls_outgoing_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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",3,3,816.333333333333,2449,0,1279,709.062996731132,1279,0.692360538889388,869,1051,1
diff --git a/tests/data/processed/test02/calls_outgoing_daily.csv b/tests/data/processed/test02/calls_outgoing_daily.csv
deleted file mode 100644
index e4fa7771..00000000
--- a/tests/data/processed/test02/calls_outgoing_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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",11,11,837.909090909091,9217,0,1530,577.720772440364,0,2.0585997872903,57,1277,1
-"2020-06-02",6,6,973.333333333333,5840,0,1530,551.313582878807,1100,1.58092421564451,418,1277,0
diff --git a/tests/data/processed/test02/calls_outgoing_evening.csv b/tests/data/processed/test02/calls_outgoing_evening.csv
deleted file mode 100644
index 7d675f85..00000000
--- a/tests/data/processed/test02/calls_outgoing_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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,1465,2930,1400,1530,91.9238815542512,1400,0.692333219466401,1156,1277,1
-"2020-06-02",3,3,980,2940,0,1530,850.823130856232,1410,0.692484030888463,1156,1277,0
diff --git a/tests/data/processed/test02/calls_outgoing_morning.csv b/tests/data/processed/test02/calls_outgoing_morning.csv
deleted file mode 100644
index c036931a..00000000
--- a/tests/data/processed/test02/calls_outgoing_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"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,959.333333333333,2878,742,1096,190.287501779106,1096,1.08529592058152,418,687,1
-"2020-06-02",3,3,966.666666666667,2900,750,1100,189.296944860009,1100,1.08563855912214,418,687,0
diff --git a/tests/data/processed/test02/calls_outgoing_night.csv b/tests/data/processed/test02/calls_outgoing_night.csv
deleted file mode 100644
index 20593c0e..00000000
--- a/tests/data/processed/test02/calls_outgoing_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"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",3,3,320,960,0,960,554.256258422041,0,0,57,257,1
diff --git a/tests/data/processed/test02/conversation_afternoon.csv b/tests/data/processed/test02/conversation_afternoon.csv
deleted file mode 100644
index 28665973..00000000
--- a/tests/data/processed/test02/conversation_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_afternoon_minutessilence,conversation_afternoon_minutesnoise,conversation_afternoon_minutesvoice,conversation_afternoon_minutesunknown,conversation_afternoon_countconversation,conversation_afternoon_silencesensedfraction,conversation_afternoon_noisesensedfraction,conversation_afternoon_voicesensedfraction,conversation_afternoon_unknownsensedfraction,conversation_afternoon_silenceexpectedfraction,conversation_afternoon_noiseexpectedfraction,conversation_afternoon_voiceexpectedfraction,conversation_afternoon_unknownexpectedfraction,conversation_afternoon_sumconversationduration,conversation_afternoon_avgconversationduration,conversation_afternoon_sdconversationduration,conversation_afternoon_minconversationduration,conversation_afternoon_maxconversationduration,conversation_afternoon_timefirstconversation,conversation_afternoon_timelastconversation,conversation_afternoon_sumenergy,conversation_afternoon_avgenergy,conversation_afternoon_sdenergy,conversation_afternoon_minenergy,conversation_afternoon_maxenergy
-2020-07-07,2.1333333333333333,27.416666666666668,8.266666666666667,1.8,5,0.05384938998737905,0.692048801009676,0.20866638620109385,0.045435422801851075,0.005925925925925926,0.07615740740740741,0.022962962962962966,0.005,12.416666666666668,2.4833333333333334,0.8701053576052348,1.7833333333333334,3.966666666666667,733.0,1038.0,11674618,4901.183039462637,3520.8178232562536,0,11997
diff --git a/tests/data/processed/test02/conversation_daily.csv b/tests/data/processed/test02/conversation_daily.csv
deleted file mode 100644
index 0185f3bd..00000000
--- a/tests/data/processed/test02/conversation_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_daily_minutessilence,conversation_daily_minutesnoise,conversation_daily_minutesvoice,conversation_daily_minutesunknown,conversation_daily_countconversation,conversation_daily_silencesensedfraction,conversation_daily_noisesensedfraction,conversation_daily_voicesensedfraction,conversation_daily_unknownsensedfraction,conversation_daily_silenceexpectedfraction,conversation_daily_noiseexpectedfraction,conversation_daily_voiceexpectedfraction,conversation_daily_unknownexpectedfraction,conversation_daily_sumconversationduration,conversation_daily_avgconversationduration,conversation_daily_sdconversationduration,conversation_daily_minconversationduration,conversation_daily_maxconversationduration,conversation_daily_timefirstconversation,conversation_daily_timelastconversation,conversation_daily_sumenergy,conversation_daily_avgenergy,conversation_daily_sdenergy,conversation_daily_minenergy,conversation_daily_maxenergy
-2020-07-07,3.7,50.63333333333333,15.066666666666666,3.683333333333333,14,0.05062713797035348,0.6928164196123148,0.206157354618016,0.05039908779931585,0.010277777777777778,0.14064814814814813,0.04185185185185185,0.01023148148148148,32.666666666666664,2.333333333333333,2.375453173139344,0.7166666666666667,10.05,73.0,1436.0,21622427,4915.305069333939,3516.4999695807187,0,11997
diff --git a/tests/data/processed/test02/conversation_evening.csv b/tests/data/processed/test02/conversation_evening.csv
deleted file mode 100644
index adc0d1cd..00000000
--- a/tests/data/processed/test02/conversation_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_evening_minutessilence,conversation_evening_minutesnoise,conversation_evening_minutesvoice,conversation_evening_minutesunknown,conversation_evening_countconversation,conversation_evening_silencesensedfraction,conversation_evening_noisesensedfraction,conversation_evening_voicesensedfraction,conversation_evening_unknownsensedfraction,conversation_evening_silenceexpectedfraction,conversation_evening_noiseexpectedfraction,conversation_evening_voiceexpectedfraction,conversation_evening_unknownexpectedfraction,conversation_evening_sumconversationduration,conversation_evening_avgconversationduration,conversation_evening_sdconversationduration,conversation_evening_minconversationduration,conversation_evening_maxconversationduration,conversation_evening_timefirstconversation,conversation_evening_timelastconversation,conversation_evening_sumenergy,conversation_evening_avgenergy,conversation_evening_sdenergy,conversation_evening_minenergy,conversation_evening_maxenergy
-2020-07-07,0.36666666666666664,4.65,1.5166666666666666,0.4166666666666667,3,0.05275779376498801,0.6690647482014389,0.21822541966426856,0.05995203836930456,0.0010185185185185184,0.012916666666666668,0.004212962962962963,0.0011574074074074076,4.883333333333333,1.6277777777777775,0.4525647078759177,1.35,2.15,1204.0,1436.0,1989527,4736.969047619048,3421.199118663052,0,11997
diff --git a/tests/data/processed/test02/conversation_morning.csv b/tests/data/processed/test02/conversation_morning.csv
deleted file mode 100644
index 35575bc3..00000000
--- a/tests/data/processed/test02/conversation_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_morning_minutessilence,conversation_morning_minutesnoise,conversation_morning_minutesvoice,conversation_morning_minutesunknown,conversation_morning_countconversation,conversation_morning_silencesensedfraction,conversation_morning_noisesensedfraction,conversation_morning_voicesensedfraction,conversation_morning_unknownsensedfraction,conversation_morning_silenceexpectedfraction,conversation_morning_noiseexpectedfraction,conversation_morning_voiceexpectedfraction,conversation_morning_unknownexpectedfraction,conversation_morning_sumconversationduration,conversation_morning_avgconversationduration,conversation_morning_sdconversationduration,conversation_morning_minconversationduration,conversation_morning_maxconversationduration,conversation_morning_timefirstconversation,conversation_morning_timelastconversation,conversation_morning_sumenergy,conversation_morning_avgenergy,conversation_morning_sdenergy,conversation_morning_minenergy,conversation_morning_maxenergy
-2020-07-07,0.5,8.266666666666667,2.433333333333333,0.65,4,0.04219409282700422,0.6976090014064699,0.20534458509142053,0.05485232067510549,0.001388888888888889,0.022962962962962966,0.006759259259259258,0.0018055555555555557,4.6,1.15,0.4283906144146001,0.75,1.6666666666666667,392.0,656.0,3535623,4944.927272727273,3443.3314096066924,0,11985
diff --git a/tests/data/processed/test02/conversation_night.csv b/tests/data/processed/test02/conversation_night.csv
deleted file mode 100644
index 5fa4f616..00000000
--- a/tests/data/processed/test02/conversation_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-local_date,conversation_night_minutessilence,conversation_night_minutesnoise,conversation_night_minutesvoice,conversation_night_minutesunknown,conversation_night_countconversation,conversation_night_silencesensedfraction,conversation_night_noisesensedfraction,conversation_night_voicesensedfraction,conversation_night_unknownsensedfraction,conversation_night_silenceexpectedfraction,conversation_night_noiseexpectedfraction,conversation_night_voiceexpectedfraction,conversation_night_unknownexpectedfraction,conversation_night_sumconversationduration,conversation_night_avgconversationduration,conversation_night_sdconversationduration,conversation_night_minconversationduration,conversation_night_maxconversationduration,conversation_night_timefirstconversation,conversation_night_timelastconversation,conversation_night_sumenergy,conversation_night_avgenergy,conversation_night_sdenergy,conversation_night_minenergy,conversation_night_maxenergy
-2020-07-07,0.7,10.3,2.85,0.8166666666666667,2,0.04772727272727273,0.7022727272727274,0.19431818181818183,0.055681818181818186,0.0019444444444444444,0.02861111111111111,0.007916666666666667,0.0022685185185185187,10.766666666666667,5.383333333333334,6.599663291074444,0.7166666666666667,10.05,73.0,359.0,4422659,5014.35260770975,3609.249684373919,0,11976
diff --git a/tests/data/processed/test02/light_afternoon.csv b/tests/data/processed/test02/light_afternoon.csv
deleted file mode 100644
index 71584288..00000000
--- a/tests/data/processed/test02/light_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_afternoon_maxlux,light_afternoon_medianlux,light_afternoon_avglux,light_afternoon_stdlux,light_afternoon_minlux,light_afternoon_count
diff --git a/tests/data/processed/test02/light_daily.csv b/tests/data/processed/test02/light_daily.csv
deleted file mode 100644
index 5162a82f..00000000
--- a/tests/data/processed/test02/light_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_daily_maxlux,light_daily_count,light_daily_minlux,light_daily_stdlux,light_daily_avglux,light_daily_medianlux
diff --git a/tests/data/processed/test02/light_evening.csv b/tests/data/processed/test02/light_evening.csv
deleted file mode 100644
index 993b04b1..00000000
--- a/tests/data/processed/test02/light_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_evening_count,light_evening_avglux,light_evening_medianlux,light_evening_minlux,light_evening_maxlux,light_evening_stdlux
diff --git a/tests/data/processed/test02/light_morning.csv b/tests/data/processed/test02/light_morning.csv
deleted file mode 100644
index b4c1fc12..00000000
--- a/tests/data/processed/test02/light_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_morning_count,light_morning_stdlux,light_morning_minlux,light_morning_maxlux,light_morning_medianlux,light_morning_avglux
diff --git a/tests/data/processed/test02/light_night.csv b/tests/data/processed/test02/light_night.csv
deleted file mode 100644
index 8a222bf8..00000000
--- a/tests/data/processed/test02/light_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_night_stdlux,light_night_maxlux,light_night_avglux,light_night_count,light_night_medianlux,light_night_minlux
diff --git a/tests/data/processed/test02/messages_received_afternoon.csv b/tests/data/processed/test02/messages_received_afternoon.csv
deleted file mode 100644
index 10344957..00000000
--- a/tests/data/processed/test02/messages_received_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_received_afternoon_countmostfrequentcontact","messages_received_afternoon_count","messages_received_afternoon_distinctcontacts","messages_received_afternoon_timefirstmessage","messages_received_afternoon_timelastmessage"
-"2020-05-28",1,2,2,830,949
diff --git a/tests/data/processed/test02/messages_received_daily.csv b/tests/data/processed/test02/messages_received_daily.csv
deleted file mode 100644
index a6143606..00000000
--- a/tests/data/processed/test02/messages_received_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_daily_countmostfrequentcontact","messages_received_daily_count","messages_received_daily_distinctcontacts","messages_received_daily_timefirstmessage","messages_received_daily_timelastmessage"
-"2020-05-28",1,12,12,6,1382
-"2020-05-29",0,6,6,401,1382
diff --git a/tests/data/processed/test02/messages_received_evening.csv b/tests/data/processed/test02/messages_received_evening.csv
deleted file mode 100644
index 01058f5a..00000000
--- a/tests/data/processed/test02/messages_received_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_evening_countmostfrequentcontact","messages_received_evening_count","messages_received_evening_distinctcontacts","messages_received_evening_timefirstmessage","messages_received_evening_timelastmessage"
-"2020-05-28",1,3,3,1173,1382
-"2020-05-29",0,3,3,1173,1382
diff --git a/tests/data/processed/test02/messages_received_morning.csv b/tests/data/processed/test02/messages_received_morning.csv
deleted file mode 100644
index 57bab4a1..00000000
--- a/tests/data/processed/test02/messages_received_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_received_morning_countmostfrequentcontact","messages_received_morning_count","messages_received_morning_distinctcontacts","messages_received_morning_timefirstmessage","messages_received_morning_timelastmessage"
-"2020-05-28",1,3,3,401,660
-"2020-05-29",0,3,3,401,660
diff --git a/tests/data/processed/test02/messages_received_night.csv b/tests/data/processed/test02/messages_received_night.csv
deleted file mode 100644
index 574edc88..00000000
--- a/tests/data/processed/test02/messages_received_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_received_night_countmostfrequentcontact","messages_received_night_count","messages_received_night_distinctcontacts","messages_received_night_timefirstmessage","messages_received_night_timelastmessage"
-"2020-05-28",1,4,4,6,312
diff --git a/tests/data/processed/test02/messages_sent_afternoon.csv b/tests/data/processed/test02/messages_sent_afternoon.csv
deleted file mode 100644
index 1ac41cd2..00000000
--- a/tests/data/processed/test02/messages_sent_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_sent_afternoon_countmostfrequentcontact","messages_sent_afternoon_count","messages_sent_afternoon_distinctcontacts","messages_sent_afternoon_timefirstmessage","messages_sent_afternoon_timelastmessage"
-"2020-05-28",1,3,3,722,979
diff --git a/tests/data/processed/test02/messages_sent_daily.csv b/tests/data/processed/test02/messages_sent_daily.csv
deleted file mode 100644
index a14ba553..00000000
--- a/tests/data/processed/test02/messages_sent_daily.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_daily_countmostfrequentcontact","messages_sent_daily_count","messages_sent_daily_distinctcontacts","messages_sent_daily_timefirstmessage","messages_sent_daily_timelastmessage"
-"2020-05-28",1,8,8,219,1401
-"2020-05-29",0,4,4,388,1401
diff --git a/tests/data/processed/test02/messages_sent_evening.csv b/tests/data/processed/test02/messages_sent_evening.csv
deleted file mode 100644
index 7a6edd68..00000000
--- a/tests/data/processed/test02/messages_sent_evening.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_evening_countmostfrequentcontact","messages_sent_evening_count","messages_sent_evening_distinctcontacts","messages_sent_evening_timefirstmessage","messages_sent_evening_timelastmessage"
-"2020-05-28",1,2,2,1218,1401
-"2020-05-29",0,2,2,1218,1401
diff --git a/tests/data/processed/test02/messages_sent_morning.csv b/tests/data/processed/test02/messages_sent_morning.csv
deleted file mode 100644
index 0a7a3e5f..00000000
--- a/tests/data/processed/test02/messages_sent_morning.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-"local_date","messages_sent_morning_countmostfrequentcontact","messages_sent_morning_count","messages_sent_morning_distinctcontacts","messages_sent_morning_timefirstmessage","messages_sent_morning_timelastmessage"
-"2020-05-28",1,2,2,388,654
-"2020-05-29",0,2,2,388,654
diff --git a/tests/data/processed/test02/messages_sent_night.csv b/tests/data/processed/test02/messages_sent_night.csv
deleted file mode 100644
index bbabc406..00000000
--- a/tests/data/processed/test02/messages_sent_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","messages_sent_night_countmostfrequentcontact","messages_sent_night_count","messages_sent_night_distinctcontacts","messages_sent_night_timefirstmessage","messages_sent_night_timelastmessage"
-"2020-05-28",1,1,1,219,219
diff --git a/tests/data/processed/test02/screen_afternoon.csv b/tests/data/processed/test02/screen_afternoon.csv
deleted file mode 100644
index 602bf31b..00000000
--- a/tests/data/processed/test02/screen_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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,720.0
diff --git a/tests/data/processed/test02/screen_daily.csv b/tests/data/processed/test02/screen_daily.csv
deleted file mode 100644
index 28c0f43d..00000000
--- a/tests/data/processed/test02/screen_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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,170.5
diff --git a/tests/data/processed/test02/screen_deltas.csv b/tests/data/processed/test02/screen_deltas.csv
deleted file mode 100644
index 7cdedb62..00000000
--- a/tests/data/processed/test02/screen_deltas.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-"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
deleted file mode 100644
index f9c8fc01..00000000
--- a/tests/data/processed/test02/screen_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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,1080.0
diff --git a/tests/data/processed/test02/screen_morning.csv b/tests/data/processed/test02/screen_morning.csv
deleted file mode 100644
index 6c9566a4..00000000
--- a/tests/data/processed/test02/screen_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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,360.0
diff --git a/tests/data/processed/test02/screen_night.csv b/tests/data/processed/test02/screen_night.csv
deleted file mode 100644
index cebc41bb..00000000
--- a/tests/data/processed/test02/screen_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-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,170.5
diff --git a/tests/data/processed/test02/wifi_afternoon.csv b/tests/data/processed/test02/wifi_afternoon.csv
deleted file mode 100644
index f89b0613..00000000
--- a/tests/data/processed/test02/wifi_afternoon.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_afternoon_countscans","wifi_afternoon_uniquedevices","wifi_afternoon_countscansmostuniquedevice"
-"2020-07-03",2,2,1
diff --git a/tests/data/processed/test02/wifi_daily.csv b/tests/data/processed/test02/wifi_daily.csv
deleted file mode 100644
index f8ff9e1c..00000000
--- a/tests/data/processed/test02/wifi_daily.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_daily_countscans","wifi_daily_uniquedevices","wifi_daily_countscansmostuniquedevice"
-"2020-07-03",14,5,4
diff --git a/tests/data/processed/test02/wifi_evening.csv b/tests/data/processed/test02/wifi_evening.csv
deleted file mode 100644
index ae6ff422..00000000
--- a/tests/data/processed/test02/wifi_evening.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_evening_countscans","wifi_evening_uniquedevices","wifi_evening_countscansmostuniquedevice"
-"2020-07-03",5,4,2
diff --git a/tests/data/processed/test02/wifi_morning.csv b/tests/data/processed/test02/wifi_morning.csv
deleted file mode 100644
index 9af5aa95..00000000
--- a/tests/data/processed/test02/wifi_morning.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_morning_countscans","wifi_morning_uniquedevices","wifi_morning_countscansmostuniquedevice"
-"2020-07-03",3,2,2
diff --git a/tests/data/processed/test02/wifi_night.csv b/tests/data/processed/test02/wifi_night.csv
deleted file mode 100644
index 9bdc0ffe..00000000
--- a/tests/data/processed/test02/wifi_night.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-"local_date","wifi_night_countscans","wifi_night_uniquedevices","wifi_night_countscansmostuniquedevice"
-"2020-07-03",4,4,1
diff --git a/tests/data/processed/test03/activity_recognition_afternoon.csv b/tests/data/processed/test03/activity_recognition_afternoon.csv
deleted file mode 100644
index cbcbc070..00000000
--- a/tests/data/processed/test03/activity_recognition_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_afternoon_summobile,ar_afternoon_countuniqueactivities,ar_afternoon_count,ar_afternoon_sumstationary,ar_afternoon_sumvehicle,ar_afternoon_mostcommonactivity,ar_afternoon_activitychangecount
diff --git a/tests/data/processed/test03/activity_recognition_daily.csv b/tests/data/processed/test03/activity_recognition_daily.csv
deleted file mode 100644
index be7af81a..00000000
--- a/tests/data/processed/test03/activity_recognition_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_daily_sumvehicle,ar_daily_countuniqueactivities,ar_daily_mostcommonactivity,ar_daily_activitychangecount,ar_daily_sumstationary,ar_daily_summobile,ar_daily_count
diff --git a/tests/data/processed/test03/activity_recognition_evening.csv b/tests/data/processed/test03/activity_recognition_evening.csv
deleted file mode 100644
index 9886f6ab..00000000
--- a/tests/data/processed/test03/activity_recognition_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_evening_count,ar_evening_summobile,ar_evening_activitychangecount,ar_evening_sumstationary,ar_evening_sumvehicle,ar_evening_countuniqueactivities,ar_evening_mostcommonactivity
diff --git a/tests/data/processed/test03/activity_recognition_morning.csv b/tests/data/processed/test03/activity_recognition_morning.csv
deleted file mode 100644
index 577b6ba0..00000000
--- a/tests/data/processed/test03/activity_recognition_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_morning_mostcommonactivity,ar_morning_activitychangecount,ar_morning_countuniqueactivities,ar_morning_summobile,ar_morning_count,ar_morning_sumvehicle,ar_morning_sumstationary
diff --git a/tests/data/processed/test03/activity_recognition_night.csv b/tests/data/processed/test03/activity_recognition_night.csv
deleted file mode 100644
index 966c0ace..00000000
--- a/tests/data/processed/test03/activity_recognition_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_night_summobile,ar_night_sumstationary,ar_night_countuniqueactivities,ar_night_mostcommonactivity,ar_night_activitychangecount,ar_night_count,ar_night_sumvehicle
diff --git a/tests/data/processed/test03/applications_foreground_afternoon.csv b/tests/data/processed/test03/applications_foreground_afternoon.csv
deleted file mode 100644
index a16fad0d..00000000
--- a/tests/data/processed/test03/applications_foreground_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_afternoon_countemail,apps_afternoon_countall,apps_afternoon_countsocial,apps_afternoon_countentertainment,apps_afternoon_counttop1global,apps_afternoon_countcom.facebook.moments,apps_afternoon_countcom.google.android.youtube,apps_afternoon_timeoffirstuseemail,apps_afternoon_timeoffirstuseall,apps_afternoon_timeoffirstusesocial,apps_afternoon_timeoffirstuseentertainment,apps_afternoon_timeoffirstusetop1global,apps_afternoon_timeoffirstusecom.facebook.moments,apps_afternoon_timeoffirstusecom.google.android.youtube,apps_afternoon_timeoflastuseemail,apps_afternoon_timeoflastuseall,apps_afternoon_timeoflastusesocial,apps_afternoon_timeoflastuseentertainment,apps_afternoon_timeoflastusetop1global,apps_afternoon_timeoflastusecom.facebook.moments,apps_afternoon_timeoflastusecom.google.android.youtube,apps_afternoon_frequencyentropyemail,apps_afternoon_frequencyentropyall,apps_afternoon_frequencyentropysocial,apps_afternoon_frequencyentropyentertainment,apps_afternoon_frequencyentropytop1global,apps_afternoon_frequencyentropycom.facebook.moments,apps_afternoon_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test03/applications_foreground_daily.csv b/tests/data/processed/test03/applications_foreground_daily.csv
deleted file mode 100644
index 3d9c0e6f..00000000
--- a/tests/data/processed/test03/applications_foreground_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_daily_countall,apps_daily_countemail,apps_daily_countsocial,apps_daily_countentertainment,apps_daily_counttop1global,apps_daily_countcom.google.android.youtube,apps_daily_countcom.facebook.moments,apps_daily_timeoffirstuseall,apps_daily_timeoffirstuseemail,apps_daily_timeoffirstusesocial,apps_daily_timeoffirstuseentertainment,apps_daily_timeoffirstusetop1global,apps_daily_timeoffirstusecom.google.android.youtube,apps_daily_timeoffirstusecom.facebook.moments,apps_daily_timeoflastuseall,apps_daily_timeoflastuseemail,apps_daily_timeoflastusesocial,apps_daily_timeoflastuseentertainment,apps_daily_timeoflastusetop1global,apps_daily_timeoflastusecom.google.android.youtube,apps_daily_timeoflastusecom.facebook.moments,apps_daily_frequencyentropyall,apps_daily_frequencyentropyemail,apps_daily_frequencyentropysocial,apps_daily_frequencyentropyentertainment,apps_daily_frequencyentropytop1global,apps_daily_frequencyentropycom.google.android.youtube,apps_daily_frequencyentropycom.facebook.moments
diff --git a/tests/data/processed/test03/applications_foreground_evening.csv b/tests/data/processed/test03/applications_foreground_evening.csv
deleted file mode 100644
index ec977e5b..00000000
--- a/tests/data/processed/test03/applications_foreground_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_evening_countall,apps_evening_countemail,apps_evening_countsocial,apps_evening_countentertainment,apps_evening_counttop1global,apps_evening_countcom.facebook.moments,apps_evening_countcom.google.android.youtube,apps_evening_timeoffirstuseall,apps_evening_timeoffirstuseemail,apps_evening_timeoffirstusesocial,apps_evening_timeoffirstuseentertainment,apps_evening_timeoffirstusetop1global,apps_evening_timeoffirstusecom.facebook.moments,apps_evening_timeoffirstusecom.google.android.youtube,apps_evening_timeoflastuseall,apps_evening_timeoflastuseemail,apps_evening_timeoflastusesocial,apps_evening_timeoflastuseentertainment,apps_evening_timeoflastusetop1global,apps_evening_timeoflastusecom.facebook.moments,apps_evening_timeoflastusecom.google.android.youtube,apps_evening_frequencyentropyall,apps_evening_frequencyentropyemail,apps_evening_frequencyentropysocial,apps_evening_frequencyentropyentertainment,apps_evening_frequencyentropytop1global,apps_evening_frequencyentropycom.facebook.moments,apps_evening_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test03/applications_foreground_morning.csv b/tests/data/processed/test03/applications_foreground_morning.csv
deleted file mode 100644
index f86a5c30..00000000
--- a/tests/data/processed/test03/applications_foreground_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_morning_countall,apps_morning_countemail,apps_morning_countsocial,apps_morning_countentertainment,apps_morning_countcom.facebook.moments,apps_morning_counttop1global,apps_morning_countcom.google.android.youtube,apps_morning_timeoffirstuseall,apps_morning_timeoffirstuseemail,apps_morning_timeoffirstusesocial,apps_morning_timeoffirstuseentertainment,apps_morning_timeoffirstusecom.facebook.moments,apps_morning_timeoffirstusetop1global,apps_morning_timeoffirstusecom.google.android.youtube,apps_morning_timeoflastuseall,apps_morning_timeoflastuseemail,apps_morning_timeoflastusesocial,apps_morning_timeoflastuseentertainment,apps_morning_timeoflastusecom.facebook.moments,apps_morning_timeoflastusetop1global,apps_morning_timeoflastusecom.google.android.youtube,apps_morning_frequencyentropyall,apps_morning_frequencyentropyemail,apps_morning_frequencyentropysocial,apps_morning_frequencyentropyentertainment,apps_morning_frequencyentropycom.facebook.moments,apps_morning_frequencyentropytop1global,apps_morning_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test03/applications_foreground_night.csv b/tests/data/processed/test03/applications_foreground_night.csv
deleted file mode 100644
index 2409c9ac..00000000
--- a/tests/data/processed/test03/applications_foreground_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_night_countemail,apps_night_countall,apps_night_countsocial,apps_night_countentertainment,apps_night_counttop1global,apps_night_countcom.facebook.moments,apps_night_countcom.google.android.youtube,apps_night_timeoffirstuseemail,apps_night_timeoffirstuseall,apps_night_timeoffirstusesocial,apps_night_timeoffirstuseentertainment,apps_night_timeoffirstusetop1global,apps_night_timeoffirstusecom.facebook.moments,apps_night_timeoffirstusecom.google.android.youtube,apps_night_timeoflastuseemail,apps_night_timeoflastuseall,apps_night_timeoflastusesocial,apps_night_timeoflastuseentertainment,apps_night_timeoflastusetop1global,apps_night_timeoflastusecom.facebook.moments,apps_night_timeoflastusecom.google.android.youtube,apps_night_frequencyentropyemail,apps_night_frequencyentropyall,apps_night_frequencyentropysocial,apps_night_frequencyentropyentertainment,apps_night_frequencyentropytop1global,apps_night_frequencyentropycom.facebook.moments,apps_night_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test03/battery_afternoon.csv b/tests/data/processed/test03/battery_afternoon.csv
deleted file mode 100644
index a95b9366..00000000
--- a/tests/data/processed/test03/battery_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_afternoon_countdischarge,battery_afternoon_maxconsumptionrate,battery_afternoon_countcharge,battery_afternoon_avgconsumptionrate,battery_afternoon_sumdurationcharge,battery_afternoon_sumdurationdischarge
diff --git a/tests/data/processed/test03/battery_daily.csv b/tests/data/processed/test03/battery_daily.csv
deleted file mode 100644
index ef6083bb..00000000
--- a/tests/data/processed/test03/battery_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_daily_sumdurationcharge,battery_daily_sumdurationdischarge,battery_daily_countdischarge,battery_daily_maxconsumptionrate,battery_daily_countcharge,battery_daily_avgconsumptionrate
diff --git a/tests/data/processed/test03/battery_deltas.csv b/tests/data/processed/test03/battery_deltas.csv
deleted file mode 100644
index a3714a6e..00000000
--- a/tests/data/processed/test03/battery_deltas.csv
+++ /dev/null
@@ -1 +0,0 @@
-"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
diff --git a/tests/data/processed/test03/battery_evening.csv b/tests/data/processed/test03/battery_evening.csv
deleted file mode 100644
index 65b9c934..00000000
--- a/tests/data/processed/test03/battery_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_evening_sumdurationcharge,battery_evening_countdischarge,battery_evening_avgconsumptionrate,battery_evening_countcharge,battery_evening_maxconsumptionrate,battery_evening_sumdurationdischarge
diff --git a/tests/data/processed/test03/battery_morning.csv b/tests/data/processed/test03/battery_morning.csv
deleted file mode 100644
index 2d4ee156..00000000
--- a/tests/data/processed/test03/battery_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_morning_sumdurationcharge,battery_morning_sumdurationdischarge,battery_morning_maxconsumptionrate,battery_morning_countcharge,battery_morning_avgconsumptionrate,battery_morning_countdischarge
diff --git a/tests/data/processed/test03/battery_night.csv b/tests/data/processed/test03/battery_night.csv
deleted file mode 100644
index e978126f..00000000
--- a/tests/data/processed/test03/battery_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_night_maxconsumptionrate,battery_night_countcharge,battery_night_sumdurationdischarge,battery_night_avgconsumptionrate,battery_night_sumdurationcharge,battery_night_countdischarge
diff --git a/tests/data/processed/test03/bluetooth_afternoon.csv b/tests/data/processed/test03/bluetooth_afternoon.csv
deleted file mode 100644
index c043ce0b..00000000
--- a/tests/data/processed/test03/bluetooth_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_afternoon_countscans","bluetooth_afternoon_uniquedevices","bluetooth_afternoon_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/bluetooth_daily.csv b/tests/data/processed/test03/bluetooth_daily.csv
deleted file mode 100644
index 4c1eac01..00000000
--- a/tests/data/processed/test03/bluetooth_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_daily_countscans","bluetooth_daily_uniquedevices","bluetooth_daily_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/bluetooth_evening.csv b/tests/data/processed/test03/bluetooth_evening.csv
deleted file mode 100644
index cba45ebf..00000000
--- a/tests/data/processed/test03/bluetooth_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_evening_countscans","bluetooth_evening_uniquedevices","bluetooth_evening_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/bluetooth_morning.csv b/tests/data/processed/test03/bluetooth_morning.csv
deleted file mode 100644
index 47d4d8ed..00000000
--- a/tests/data/processed/test03/bluetooth_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_morning_countscans","bluetooth_morning_uniquedevices","bluetooth_morning_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/bluetooth_night.csv b/tests/data/processed/test03/bluetooth_night.csv
deleted file mode 100644
index 27c31a0c..00000000
--- a/tests/data/processed/test03/bluetooth_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_night_countscans","bluetooth_night_uniquedevices","bluetooth_night_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/calls_incoming_afternoon.csv b/tests/data/processed/test03/calls_incoming_afternoon.csv
deleted file mode 100644
index 7700f26f..00000000
--- a/tests/data/processed/test03/calls_incoming_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_incoming_daily.csv b/tests/data/processed/test03/calls_incoming_daily.csv
deleted file mode 100644
index 15a7ab61..00000000
--- a/tests/data/processed/test03/calls_incoming_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_incoming_evening.csv b/tests/data/processed/test03/calls_incoming_evening.csv
deleted file mode 100644
index 8b52a987..00000000
--- a/tests/data/processed/test03/calls_incoming_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_incoming_morning.csv b/tests/data/processed/test03/calls_incoming_morning.csv
deleted file mode 100644
index 5e6c2b05..00000000
--- a/tests/data/processed/test03/calls_incoming_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_incoming_night.csv b/tests/data/processed/test03/calls_incoming_night.csv
deleted file mode 100644
index d5718bda..00000000
--- a/tests/data/processed/test03/calls_incoming_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_missed_afternoon.csv b/tests/data/processed/test03/calls_missed_afternoon.csv
deleted file mode 100644
index 7b1d275f..00000000
--- a/tests/data/processed/test03/calls_missed_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_afternoon_count","call_missed_afternoon_distinctcontacts","call_missed_afternoon_timefirstcall","call_missed_afternoon_timelastcall","call_missed_afternoon_countmostfrequentcontact"
diff --git a/tests/data/processed/test03/calls_missed_daily.csv b/tests/data/processed/test03/calls_missed_daily.csv
deleted file mode 100644
index 52bccdee..00000000
--- a/tests/data/processed/test03/calls_missed_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_daily_count","call_missed_daily_distinctcontacts","call_missed_daily_timefirstcall","call_missed_daily_timelastcall","call_missed_daily_countmostfrequentcontact"
diff --git a/tests/data/processed/test03/calls_missed_evening.csv b/tests/data/processed/test03/calls_missed_evening.csv
deleted file mode 100644
index 5d1d36c7..00000000
--- a/tests/data/processed/test03/calls_missed_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_evening_count","call_missed_evening_distinctcontacts","call_missed_evening_timefirstcall","call_missed_evening_timelastcall","call_missed_evening_countmostfrequentcontact"
diff --git a/tests/data/processed/test03/calls_missed_morning.csv b/tests/data/processed/test03/calls_missed_morning.csv
deleted file mode 100644
index 573c74f8..00000000
--- a/tests/data/processed/test03/calls_missed_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_morning_count","call_missed_morning_distinctcontacts","call_missed_morning_timefirstcall","call_missed_morning_timelastcall","call_missed_morning_countmostfrequentcontact"
diff --git a/tests/data/processed/test03/calls_missed_night.csv b/tests/data/processed/test03/calls_missed_night.csv
deleted file mode 100644
index 61557e4e..00000000
--- a/tests/data/processed/test03/calls_missed_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_night_count","call_missed_night_distinctcontacts","call_missed_night_timefirstcall","call_missed_night_timelastcall","call_missed_night_countmostfrequentcontact"
diff --git a/tests/data/processed/test03/calls_outgoing_afternoon.csv b/tests/data/processed/test03/calls_outgoing_afternoon.csv
deleted file mode 100644
index 3430c380..00000000
--- a/tests/data/processed/test03/calls_outgoing_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_outgoing_daily.csv b/tests/data/processed/test03/calls_outgoing_daily.csv
deleted file mode 100644
index ed6ee7fa..00000000
--- a/tests/data/processed/test03/calls_outgoing_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_outgoing_evening.csv b/tests/data/processed/test03/calls_outgoing_evening.csv
deleted file mode 100644
index a459636a..00000000
--- a/tests/data/processed/test03/calls_outgoing_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_outgoing_morning.csv b/tests/data/processed/test03/calls_outgoing_morning.csv
deleted file mode 100644
index 0beb5827..00000000
--- a/tests/data/processed/test03/calls_outgoing_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/calls_outgoing_night.csv b/tests/data/processed/test03/calls_outgoing_night.csv
deleted file mode 100644
index fa763f36..00000000
--- a/tests/data/processed/test03/calls_outgoing_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test03/conversation_afternoon.csv b/tests/data/processed/test03/conversation_afternoon.csv
deleted file mode 100644
index 06316647..00000000
--- a/tests/data/processed/test03/conversation_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_afternoon_maxenergy,conversation_afternoon_unknownexpectedfraction,conversation_afternoon_avgconversationduration,conversation_afternoon_unknownsensedfraction,conversation_afternoon_noisesensedfraction,conversation_afternoon_minutesvoice,conversation_afternoon_maxconversationduration,conversation_afternoon_avgenergy,conversation_afternoon_sdconversationduration,conversation_afternoon_silenceexpectedfraction,conversation_afternoon_noiseexpectedfraction,conversation_afternoon_minutesnoise,conversation_afternoon_voicesensedfraction,conversation_afternoon_silencesensedfraction,conversation_afternoon_minenergy,conversation_afternoon_timelastconversation,conversation_afternoon_voiceexpectedfraction,conversation_afternoon_timefirstconversation,conversation_afternoon_minutesunknown,conversation_afternoon_sumconversationduration,conversation_afternoon_minconversationduration,conversation_afternoon_sumenergy,conversation_afternoon_sdenergy,conversation_afternoon_countconversation,conversation_afternoon_minutessilence
diff --git a/tests/data/processed/test03/conversation_daily.csv b/tests/data/processed/test03/conversation_daily.csv
deleted file mode 100644
index 466a58b8..00000000
--- a/tests/data/processed/test03/conversation_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_daily_unknownsensedfraction,conversation_daily_sumconversationduration,conversation_daily_maxenergy,conversation_daily_unknownexpectedfraction,conversation_daily_minutesvoice,conversation_daily_minutessilence,conversation_daily_avgenergy,conversation_daily_minenergy,conversation_daily_timelastconversation,conversation_daily_sdconversationduration,conversation_daily_silenceexpectedfraction,conversation_daily_noiseexpectedfraction,conversation_daily_voicesensedfraction,conversation_daily_sdenergy,conversation_daily_maxconversationduration,conversation_daily_avgconversationduration,conversation_daily_sumenergy,conversation_daily_voiceexpectedfraction,conversation_daily_minutesnoise,conversation_daily_minutesunknown,conversation_daily_noisesensedfraction,conversation_daily_minconversationduration,conversation_daily_timefirstconversation,conversation_daily_countconversation,conversation_daily_silencesensedfraction
diff --git a/tests/data/processed/test03/conversation_evening.csv b/tests/data/processed/test03/conversation_evening.csv
deleted file mode 100644
index f7bc6158..00000000
--- a/tests/data/processed/test03/conversation_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_evening_noiseexpectedfraction,conversation_evening_minenergy,conversation_evening_noisesensedfraction,conversation_evening_voicesensedfraction,conversation_evening_sdenergy,conversation_evening_unknownsensedfraction,conversation_evening_minutesvoice,conversation_evening_minutesunknown,conversation_evening_minutesnoise,conversation_evening_timelastconversation,conversation_evening_silenceexpectedfraction,conversation_evening_timefirstconversation,conversation_evening_minutessilence,conversation_evening_silencesensedfraction,conversation_evening_sdconversationduration,conversation_evening_countconversation,conversation_evening_maxconversationduration,conversation_evening_unknownexpectedfraction,conversation_evening_avgenergy,conversation_evening_voiceexpectedfraction,conversation_evening_minconversationduration,conversation_evening_maxenergy,conversation_evening_sumenergy,conversation_evening_sumconversationduration,conversation_evening_avgconversationduration
diff --git a/tests/data/processed/test03/conversation_morning.csv b/tests/data/processed/test03/conversation_morning.csv
deleted file mode 100644
index 682bf4e2..00000000
--- a/tests/data/processed/test03/conversation_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_morning_unknownexpectedfraction,conversation_morning_voicesensedfraction,conversation_morning_avgconversationduration,conversation_morning_minconversationduration,conversation_morning_sumconversationduration,conversation_morning_unknownsensedfraction,conversation_morning_sdconversationduration,conversation_morning_avgenergy,conversation_morning_minutesunknown,conversation_morning_timefirstconversation,conversation_morning_minenergy,conversation_morning_timelastconversation,conversation_morning_silenceexpectedfraction,conversation_morning_minutesnoise,conversation_morning_sumenergy,conversation_morning_silencesensedfraction,conversation_morning_maxenergy,conversation_morning_voiceexpectedfraction,conversation_morning_sdenergy,conversation_morning_minutesvoice,conversation_morning_maxconversationduration,conversation_morning_noiseexpectedfraction,conversation_morning_minutessilence,conversation_morning_noisesensedfraction,conversation_morning_countconversation
diff --git a/tests/data/processed/test03/conversation_night.csv b/tests/data/processed/test03/conversation_night.csv
deleted file mode 100644
index 44880e10..00000000
--- a/tests/data/processed/test03/conversation_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_night_minenergy,conversation_night_voicesensedfraction,conversation_night_noisesensedfraction,conversation_night_minutesunknown,conversation_night_timelastconversation,conversation_night_avgconversationduration,conversation_night_sdconversationduration,conversation_night_silenceexpectedfraction,conversation_night_minconversationduration,conversation_night_sumenergy,conversation_night_maxconversationduration,conversation_night_minutessilence,conversation_night_maxenergy,conversation_night_unknownsensedfraction,conversation_night_noiseexpectedfraction,conversation_night_minutesvoice,conversation_night_avgenergy,conversation_night_minutesnoise,conversation_night_timefirstconversation,conversation_night_unknownexpectedfraction,conversation_night_voiceexpectedfraction,conversation_night_sdenergy,conversation_night_silencesensedfraction,conversation_night_countconversation,conversation_night_sumconversationduration
diff --git a/tests/data/processed/test03/light_afternoon.csv b/tests/data/processed/test03/light_afternoon.csv
deleted file mode 100644
index ee008597..00000000
--- a/tests/data/processed/test03/light_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_afternoon_maxlux,light_afternoon_medianlux,light_afternoon_minlux,light_afternoon_stdlux,light_afternoon_count,light_afternoon_avglux
diff --git a/tests/data/processed/test03/light_daily.csv b/tests/data/processed/test03/light_daily.csv
deleted file mode 100644
index e1791592..00000000
--- a/tests/data/processed/test03/light_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_daily_maxlux,light_daily_avglux,light_daily_count,light_daily_minlux,light_daily_medianlux,light_daily_stdlux
diff --git a/tests/data/processed/test03/light_evening.csv b/tests/data/processed/test03/light_evening.csv
deleted file mode 100644
index bea84344..00000000
--- a/tests/data/processed/test03/light_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_evening_stdlux,light_evening_medianlux,light_evening_maxlux,light_evening_count,light_evening_minlux,light_evening_avglux
diff --git a/tests/data/processed/test03/light_morning.csv b/tests/data/processed/test03/light_morning.csv
deleted file mode 100644
index 79cd0bc5..00000000
--- a/tests/data/processed/test03/light_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_morning_stdlux,light_morning_medianlux,light_morning_maxlux,light_morning_minlux,light_morning_count,light_morning_avglux
diff --git a/tests/data/processed/test03/light_night.csv b/tests/data/processed/test03/light_night.csv
deleted file mode 100644
index 02300377..00000000
--- a/tests/data/processed/test03/light_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_night_maxlux,light_night_medianlux,light_night_minlux,light_night_stdlux,light_night_count,light_night_avglux
diff --git a/tests/data/processed/test03/messages_received_afternoon.csv b/tests/data/processed/test03/messages_received_afternoon.csv
deleted file mode 100644
index 640096b5..00000000
--- a/tests/data/processed/test03/messages_received_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_afternoon_countmostfrequentcontact","messages_received_afternoon_count","messages_received_afternoon_distinctcontacts","messages_received_afternoon_timefirstmessage","messages_received_afternoon_timelastmessage"
diff --git a/tests/data/processed/test03/messages_received_daily.csv b/tests/data/processed/test03/messages_received_daily.csv
deleted file mode 100644
index de5543b9..00000000
--- a/tests/data/processed/test03/messages_received_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_daily_countmostfrequentcontact","messages_received_daily_count","messages_received_daily_distinctcontacts","messages_received_daily_timefirstmessage","messages_received_daily_timelastmessage"
diff --git a/tests/data/processed/test03/messages_received_evening.csv b/tests/data/processed/test03/messages_received_evening.csv
deleted file mode 100644
index 7325e9a9..00000000
--- a/tests/data/processed/test03/messages_received_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_evening_countmostfrequentcontact","messages_received_evening_count","messages_received_evening_distinctcontacts","messages_received_evening_timefirstmessage","messages_received_evening_timelastmessage"
diff --git a/tests/data/processed/test03/messages_received_morning.csv b/tests/data/processed/test03/messages_received_morning.csv
deleted file mode 100644
index bbd446c3..00000000
--- a/tests/data/processed/test03/messages_received_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_morning_countmostfrequentcontact","messages_received_morning_count","messages_received_morning_distinctcontacts","messages_received_morning_timefirstmessage","messages_received_morning_timelastmessage"
diff --git a/tests/data/processed/test03/messages_received_night.csv b/tests/data/processed/test03/messages_received_night.csv
deleted file mode 100644
index 2d0ae76f..00000000
--- a/tests/data/processed/test03/messages_received_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_night_countmostfrequentcontact","messages_received_night_count","messages_received_night_distinctcontacts","messages_received_night_timefirstmessage","messages_received_night_timelastmessage"
diff --git a/tests/data/processed/test03/messages_sent_afternoon.csv b/tests/data/processed/test03/messages_sent_afternoon.csv
deleted file mode 100644
index ab84aaba..00000000
--- a/tests/data/processed/test03/messages_sent_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_afternoon_countmostfrequentcontact","messages_sent_afternoon_count","messages_sent_afternoon_distinctcontacts","messages_sent_afternoon_timefirstmessage","messages_sent_afternoon_timelastmessage"
diff --git a/tests/data/processed/test03/messages_sent_daily.csv b/tests/data/processed/test03/messages_sent_daily.csv
deleted file mode 100644
index f827b72f..00000000
--- a/tests/data/processed/test03/messages_sent_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_daily_countmostfrequentcontact","messages_sent_daily_count","messages_sent_daily_distinctcontacts","messages_sent_daily_timefirstmessage","messages_sent_daily_timelastmessage"
diff --git a/tests/data/processed/test03/messages_sent_evening.csv b/tests/data/processed/test03/messages_sent_evening.csv
deleted file mode 100644
index ddfed962..00000000
--- a/tests/data/processed/test03/messages_sent_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_evening_countmostfrequentcontact","messages_sent_evening_count","messages_sent_evening_distinctcontacts","messages_sent_evening_timefirstmessage","messages_sent_evening_timelastmessage"
diff --git a/tests/data/processed/test03/messages_sent_morning.csv b/tests/data/processed/test03/messages_sent_morning.csv
deleted file mode 100644
index 80235f96..00000000
--- a/tests/data/processed/test03/messages_sent_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_morning_countmostfrequentcontact","messages_sent_morning_count","messages_sent_morning_distinctcontacts","messages_sent_morning_timefirstmessage","messages_sent_morning_timelastmessage"
diff --git a/tests/data/processed/test03/messages_sent_night.csv b/tests/data/processed/test03/messages_sent_night.csv
deleted file mode 100644
index 1b4351e0..00000000
--- a/tests/data/processed/test03/messages_sent_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_night_countmostfrequentcontact","messages_sent_night_count","messages_sent_night_distinctcontacts","messages_sent_night_timefirstmessage","messages_sent_night_timelastmessage"
diff --git a/tests/data/processed/test03/screen_afternoon.csv b/tests/data/processed/test03/screen_afternoon.csv
deleted file mode 100644
index 1bcf3206..00000000
--- a/tests/data/processed/test03/screen_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_afternoon_countepisodeunlock,screen_afternoon_stddurationunlock,screen_afternoon_avgdurationunlock,screen_afternoon_episodepersensedminutesunlock,screen_afternoon_firstuseafter00unlock,screen_afternoon_mindurationunlock,screen_afternoon_maxdurationunlock,screen_afternoon_sumdurationunlock
diff --git a/tests/data/processed/test03/screen_daily.csv b/tests/data/processed/test03/screen_daily.csv
deleted file mode 100644
index d06a5734..00000000
--- a/tests/data/processed/test03/screen_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_daily_episodepersensedminutesunlock,screen_daily_stddurationunlock,screen_daily_avgdurationunlock,screen_daily_sumdurationunlock,screen_daily_mindurationunlock,screen_daily_firstuseafter00unlock,screen_daily_countepisodeunlock,screen_daily_maxdurationunlock
diff --git a/tests/data/processed/test03/screen_deltas.csv b/tests/data/processed/test03/screen_deltas.csv
deleted file mode 100644
index 8209e74c..00000000
--- a/tests/data/processed/test03/screen_deltas.csv
+++ /dev/null
@@ -1 +0,0 @@
-"episode","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
diff --git a/tests/data/processed/test03/screen_evening.csv b/tests/data/processed/test03/screen_evening.csv
deleted file mode 100644
index 184b7b44..00000000
--- a/tests/data/processed/test03/screen_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_evening_stddurationunlock,screen_evening_maxdurationunlock,screen_evening_mindurationunlock,screen_evening_sumdurationunlock,screen_evening_countepisodeunlock,screen_evening_avgdurationunlock,screen_evening_firstuseafter00unlock,screen_evening_episodepersensedminutesunlock
diff --git a/tests/data/processed/test03/screen_morning.csv b/tests/data/processed/test03/screen_morning.csv
deleted file mode 100644
index 14809678..00000000
--- a/tests/data/processed/test03/screen_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_morning_maxdurationunlock,screen_morning_countepisodeunlock,screen_morning_stddurationunlock,screen_morning_firstuseafter00unlock,screen_morning_mindurationunlock,screen_morning_sumdurationunlock,screen_morning_avgdurationunlock,screen_morning_episodepersensedminutesunlock
diff --git a/tests/data/processed/test03/screen_night.csv b/tests/data/processed/test03/screen_night.csv
deleted file mode 100644
index a577efa3..00000000
--- a/tests/data/processed/test03/screen_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_night_mindurationunlock,screen_night_avgdurationunlock,screen_night_sumdurationunlock,screen_night_firstuseafter00unlock,screen_night_stddurationunlock,screen_night_episodepersensedminutesunlock,screen_night_countepisodeunlock,screen_night_maxdurationunlock
diff --git a/tests/data/processed/test03/wifi_afternoon.csv b/tests/data/processed/test03/wifi_afternoon.csv
deleted file mode 100644
index e23766ae..00000000
--- a/tests/data/processed/test03/wifi_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_afternoon_countscans","wifi_afternoon_uniquedevices","wifi_afternoon_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/wifi_daily.csv b/tests/data/processed/test03/wifi_daily.csv
deleted file mode 100644
index 569ec612..00000000
--- a/tests/data/processed/test03/wifi_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_daily_countscans","wifi_daily_uniquedevices","wifi_daily_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/wifi_evening.csv b/tests/data/processed/test03/wifi_evening.csv
deleted file mode 100644
index d2879ba8..00000000
--- a/tests/data/processed/test03/wifi_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_evening_countscans","wifi_evening_uniquedevices","wifi_evening_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/wifi_morning.csv b/tests/data/processed/test03/wifi_morning.csv
deleted file mode 100644
index f34385b1..00000000
--- a/tests/data/processed/test03/wifi_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_morning_countscans","wifi_morning_uniquedevices","wifi_morning_countscansmostuniquedevice"
diff --git a/tests/data/processed/test03/wifi_night.csv b/tests/data/processed/test03/wifi_night.csv
deleted file mode 100644
index c9660149..00000000
--- a/tests/data/processed/test03/wifi_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_night_countscans","wifi_night_uniquedevices","wifi_night_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/activity_recognition_afternoon.csv b/tests/data/processed/test04/activity_recognition_afternoon.csv
deleted file mode 100644
index aebb430a..00000000
--- a/tests/data/processed/test04/activity_recognition_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_afternoon_activitychangecount,ar_afternoon_mostcommonactivity,ar_afternoon_sumvehicle,ar_afternoon_countuniqueactivities,ar_afternoon_summobile,ar_afternoon_sumstationary,ar_afternoon_count
diff --git a/tests/data/processed/test04/activity_recognition_daily.csv b/tests/data/processed/test04/activity_recognition_daily.csv
deleted file mode 100644
index 104f6dac..00000000
--- a/tests/data/processed/test04/activity_recognition_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_daily_count,ar_daily_sumstationary,ar_daily_countuniqueactivities,ar_daily_summobile,ar_daily_sumvehicle,ar_daily_mostcommonactivity,ar_daily_activitychangecount
diff --git a/tests/data/processed/test04/activity_recognition_evening.csv b/tests/data/processed/test04/activity_recognition_evening.csv
deleted file mode 100644
index 5708f362..00000000
--- a/tests/data/processed/test04/activity_recognition_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_evening_sumvehicle,ar_evening_activitychangecount,ar_evening_sumstationary,ar_evening_summobile,ar_evening_mostcommonactivity,ar_evening_count,ar_evening_countuniqueactivities
diff --git a/tests/data/processed/test04/activity_recognition_morning.csv b/tests/data/processed/test04/activity_recognition_morning.csv
deleted file mode 100644
index 24122ea7..00000000
--- a/tests/data/processed/test04/activity_recognition_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_morning_mostcommonactivity,ar_morning_sumvehicle,ar_morning_countuniqueactivities,ar_morning_sumstationary,ar_morning_count,ar_morning_summobile,ar_morning_activitychangecount
diff --git a/tests/data/processed/test04/activity_recognition_night.csv b/tests/data/processed/test04/activity_recognition_night.csv
deleted file mode 100644
index 0d143f6f..00000000
--- a/tests/data/processed/test04/activity_recognition_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,ar_night_count,ar_night_countuniqueactivities,ar_night_sumstationary,ar_night_sumvehicle,ar_night_activitychangecount,ar_night_summobile,ar_night_mostcommonactivity
diff --git a/tests/data/processed/test04/applications_foreground_afternoon.csv b/tests/data/processed/test04/applications_foreground_afternoon.csv
deleted file mode 100644
index 36c73188..00000000
--- a/tests/data/processed/test04/applications_foreground_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_afternoon_countemail,apps_afternoon_countall,apps_afternoon_countentertainment,apps_afternoon_countsocial,apps_afternoon_countcom.facebook.moments,apps_afternoon_countcom.google.android.youtube,apps_afternoon_counttop1global,apps_afternoon_timeoffirstuseemail,apps_afternoon_timeoffirstuseall,apps_afternoon_timeoffirstuseentertainment,apps_afternoon_timeoffirstusesocial,apps_afternoon_timeoffirstusecom.facebook.moments,apps_afternoon_timeoffirstusecom.google.android.youtube,apps_afternoon_timeoffirstusetop1global,apps_afternoon_timeoflastuseemail,apps_afternoon_timeoflastuseall,apps_afternoon_timeoflastuseentertainment,apps_afternoon_timeoflastusesocial,apps_afternoon_timeoflastusecom.facebook.moments,apps_afternoon_timeoflastusecom.google.android.youtube,apps_afternoon_timeoflastusetop1global,apps_afternoon_frequencyentropyemail,apps_afternoon_frequencyentropyall,apps_afternoon_frequencyentropyentertainment,apps_afternoon_frequencyentropysocial,apps_afternoon_frequencyentropycom.facebook.moments,apps_afternoon_frequencyentropycom.google.android.youtube,apps_afternoon_frequencyentropytop1global
diff --git a/tests/data/processed/test04/applications_foreground_daily.csv b/tests/data/processed/test04/applications_foreground_daily.csv
deleted file mode 100644
index 660db104..00000000
--- a/tests/data/processed/test04/applications_foreground_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_daily_countall,apps_daily_countemail,apps_daily_countsocial,apps_daily_countentertainment,apps_daily_countcom.facebook.moments,apps_daily_counttop1global,apps_daily_countcom.google.android.youtube,apps_daily_timeoffirstuseall,apps_daily_timeoffirstuseemail,apps_daily_timeoffirstusesocial,apps_daily_timeoffirstuseentertainment,apps_daily_timeoffirstusecom.facebook.moments,apps_daily_timeoffirstusetop1global,apps_daily_timeoffirstusecom.google.android.youtube,apps_daily_timeoflastuseall,apps_daily_timeoflastuseemail,apps_daily_timeoflastusesocial,apps_daily_timeoflastuseentertainment,apps_daily_timeoflastusecom.facebook.moments,apps_daily_timeoflastusetop1global,apps_daily_timeoflastusecom.google.android.youtube,apps_daily_frequencyentropyall,apps_daily_frequencyentropyemail,apps_daily_frequencyentropysocial,apps_daily_frequencyentropyentertainment,apps_daily_frequencyentropycom.facebook.moments,apps_daily_frequencyentropytop1global,apps_daily_frequencyentropycom.google.android.youtube
diff --git a/tests/data/processed/test04/applications_foreground_evening.csv b/tests/data/processed/test04/applications_foreground_evening.csv
deleted file mode 100644
index 680f8a20..00000000
--- a/tests/data/processed/test04/applications_foreground_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_evening_countemail,apps_evening_countall,apps_evening_countentertainment,apps_evening_countsocial,apps_evening_counttop1global,apps_evening_countcom.google.android.youtube,apps_evening_countcom.facebook.moments,apps_evening_timeoffirstuseemail,apps_evening_timeoffirstuseall,apps_evening_timeoffirstuseentertainment,apps_evening_timeoffirstusesocial,apps_evening_timeoffirstusetop1global,apps_evening_timeoffirstusecom.google.android.youtube,apps_evening_timeoffirstusecom.facebook.moments,apps_evening_timeoflastuseemail,apps_evening_timeoflastuseall,apps_evening_timeoflastuseentertainment,apps_evening_timeoflastusesocial,apps_evening_timeoflastusetop1global,apps_evening_timeoflastusecom.google.android.youtube,apps_evening_timeoflastusecom.facebook.moments,apps_evening_frequencyentropyemail,apps_evening_frequencyentropyall,apps_evening_frequencyentropyentertainment,apps_evening_frequencyentropysocial,apps_evening_frequencyentropytop1global,apps_evening_frequencyentropycom.google.android.youtube,apps_evening_frequencyentropycom.facebook.moments
diff --git a/tests/data/processed/test04/applications_foreground_morning.csv b/tests/data/processed/test04/applications_foreground_morning.csv
deleted file mode 100644
index 8b10a1ab..00000000
--- a/tests/data/processed/test04/applications_foreground_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_morning_countemail,apps_morning_countall,apps_morning_countsocial,apps_morning_countentertainment,apps_morning_countcom.google.android.youtube,apps_morning_countcom.facebook.moments,apps_morning_counttop1global,apps_morning_timeoffirstuseemail,apps_morning_timeoffirstuseall,apps_morning_timeoffirstusesocial,apps_morning_timeoffirstuseentertainment,apps_morning_timeoffirstusecom.google.android.youtube,apps_morning_timeoffirstusecom.facebook.moments,apps_morning_timeoffirstusetop1global,apps_morning_timeoflastuseemail,apps_morning_timeoflastuseall,apps_morning_timeoflastusesocial,apps_morning_timeoflastuseentertainment,apps_morning_timeoflastusecom.google.android.youtube,apps_morning_timeoflastusecom.facebook.moments,apps_morning_timeoflastusetop1global,apps_morning_frequencyentropyemail,apps_morning_frequencyentropyall,apps_morning_frequencyentropysocial,apps_morning_frequencyentropyentertainment,apps_morning_frequencyentropycom.google.android.youtube,apps_morning_frequencyentropycom.facebook.moments,apps_morning_frequencyentropytop1global
diff --git a/tests/data/processed/test04/applications_foreground_night.csv b/tests/data/processed/test04/applications_foreground_night.csv
deleted file mode 100644
index 2b589972..00000000
--- a/tests/data/processed/test04/applications_foreground_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,apps_night_countall,apps_night_countemail,apps_night_countentertainment,apps_night_countsocial,apps_night_countcom.google.android.youtube,apps_night_counttop1global,apps_night_countcom.facebook.moments,apps_night_timeoffirstuseall,apps_night_timeoffirstuseemail,apps_night_timeoffirstuseentertainment,apps_night_timeoffirstusesocial,apps_night_timeoffirstusecom.google.android.youtube,apps_night_timeoffirstusetop1global,apps_night_timeoffirstusecom.facebook.moments,apps_night_timeoflastuseall,apps_night_timeoflastuseemail,apps_night_timeoflastuseentertainment,apps_night_timeoflastusesocial,apps_night_timeoflastusecom.google.android.youtube,apps_night_timeoflastusetop1global,apps_night_timeoflastusecom.facebook.moments,apps_night_frequencyentropyall,apps_night_frequencyentropyemail,apps_night_frequencyentropyentertainment,apps_night_frequencyentropysocial,apps_night_frequencyentropycom.google.android.youtube,apps_night_frequencyentropytop1global,apps_night_frequencyentropycom.facebook.moments
diff --git a/tests/data/processed/test04/battery_afternoon.csv b/tests/data/processed/test04/battery_afternoon.csv
deleted file mode 100644
index db64a165..00000000
--- a/tests/data/processed/test04/battery_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_afternoon_countcharge,battery_afternoon_sumdurationcharge,battery_afternoon_sumdurationdischarge,battery_afternoon_maxconsumptionrate,battery_afternoon_avgconsumptionrate,battery_afternoon_countdischarge
diff --git a/tests/data/processed/test04/battery_daily.csv b/tests/data/processed/test04/battery_daily.csv
deleted file mode 100644
index 033d0b06..00000000
--- a/tests/data/processed/test04/battery_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_daily_maxconsumptionrate,battery_daily_countdischarge,battery_daily_countcharge,battery_daily_avgconsumptionrate,battery_daily_sumdurationdischarge,battery_daily_sumdurationcharge
diff --git a/tests/data/processed/test04/battery_deltas.csv b/tests/data/processed/test04/battery_deltas.csv
deleted file mode 100644
index a3714a6e..00000000
--- a/tests/data/processed/test04/battery_deltas.csv
+++ /dev/null
@@ -1 +0,0 @@
-"battery_diff","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
diff --git a/tests/data/processed/test04/battery_evening.csv b/tests/data/processed/test04/battery_evening.csv
deleted file mode 100644
index 5dd6b96b..00000000
--- a/tests/data/processed/test04/battery_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_evening_sumdurationdischarge,battery_evening_sumdurationcharge,battery_evening_maxconsumptionrate,battery_evening_avgconsumptionrate,battery_evening_countdischarge,battery_evening_countcharge
diff --git a/tests/data/processed/test04/battery_morning.csv b/tests/data/processed/test04/battery_morning.csv
deleted file mode 100644
index 23a19699..00000000
--- a/tests/data/processed/test04/battery_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_morning_countcharge,battery_morning_avgconsumptionrate,battery_morning_countdischarge,battery_morning_sumdurationdischarge,battery_morning_maxconsumptionrate,battery_morning_sumdurationcharge
diff --git a/tests/data/processed/test04/battery_night.csv b/tests/data/processed/test04/battery_night.csv
deleted file mode 100644
index c9bb058a..00000000
--- a/tests/data/processed/test04/battery_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,battery_night_countdischarge,battery_night_maxconsumptionrate,battery_night_sumdurationdischarge,battery_night_countcharge,battery_night_sumdurationcharge,battery_night_avgconsumptionrate
diff --git a/tests/data/processed/test04/bluetooth_afternoon.csv b/tests/data/processed/test04/bluetooth_afternoon.csv
deleted file mode 100644
index c043ce0b..00000000
--- a/tests/data/processed/test04/bluetooth_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_afternoon_countscans","bluetooth_afternoon_uniquedevices","bluetooth_afternoon_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/bluetooth_daily.csv b/tests/data/processed/test04/bluetooth_daily.csv
deleted file mode 100644
index 4c1eac01..00000000
--- a/tests/data/processed/test04/bluetooth_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_daily_countscans","bluetooth_daily_uniquedevices","bluetooth_daily_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/bluetooth_evening.csv b/tests/data/processed/test04/bluetooth_evening.csv
deleted file mode 100644
index cba45ebf..00000000
--- a/tests/data/processed/test04/bluetooth_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_evening_countscans","bluetooth_evening_uniquedevices","bluetooth_evening_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/bluetooth_morning.csv b/tests/data/processed/test04/bluetooth_morning.csv
deleted file mode 100644
index 47d4d8ed..00000000
--- a/tests/data/processed/test04/bluetooth_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_morning_countscans","bluetooth_morning_uniquedevices","bluetooth_morning_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/bluetooth_night.csv b/tests/data/processed/test04/bluetooth_night.csv
deleted file mode 100644
index 27c31a0c..00000000
--- a/tests/data/processed/test04/bluetooth_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","bluetooth_night_countscans","bluetooth_night_uniquedevices","bluetooth_night_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/calls_incoming_afternoon.csv b/tests/data/processed/test04/calls_incoming_afternoon.csv
deleted file mode 100644
index 7700f26f..00000000
--- a/tests/data/processed/test04/calls_incoming_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_incoming_daily.csv b/tests/data/processed/test04/calls_incoming_daily.csv
deleted file mode 100644
index 15a7ab61..00000000
--- a/tests/data/processed/test04/calls_incoming_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_incoming_evening.csv b/tests/data/processed/test04/calls_incoming_evening.csv
deleted file mode 100644
index 8b52a987..00000000
--- a/tests/data/processed/test04/calls_incoming_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_incoming_morning.csv b/tests/data/processed/test04/calls_incoming_morning.csv
deleted file mode 100644
index 5e6c2b05..00000000
--- a/tests/data/processed/test04/calls_incoming_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_incoming_night.csv b/tests/data/processed/test04/calls_incoming_night.csv
deleted file mode 100644
index d5718bda..00000000
--- a/tests/data/processed/test04/calls_incoming_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_missed_afternoon.csv b/tests/data/processed/test04/calls_missed_afternoon.csv
deleted file mode 100644
index 7b1d275f..00000000
--- a/tests/data/processed/test04/calls_missed_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_afternoon_count","call_missed_afternoon_distinctcontacts","call_missed_afternoon_timefirstcall","call_missed_afternoon_timelastcall","call_missed_afternoon_countmostfrequentcontact"
diff --git a/tests/data/processed/test04/calls_missed_daily.csv b/tests/data/processed/test04/calls_missed_daily.csv
deleted file mode 100644
index 52bccdee..00000000
--- a/tests/data/processed/test04/calls_missed_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_daily_count","call_missed_daily_distinctcontacts","call_missed_daily_timefirstcall","call_missed_daily_timelastcall","call_missed_daily_countmostfrequentcontact"
diff --git a/tests/data/processed/test04/calls_missed_evening.csv b/tests/data/processed/test04/calls_missed_evening.csv
deleted file mode 100644
index 5d1d36c7..00000000
--- a/tests/data/processed/test04/calls_missed_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_evening_count","call_missed_evening_distinctcontacts","call_missed_evening_timefirstcall","call_missed_evening_timelastcall","call_missed_evening_countmostfrequentcontact"
diff --git a/tests/data/processed/test04/calls_missed_morning.csv b/tests/data/processed/test04/calls_missed_morning.csv
deleted file mode 100644
index 573c74f8..00000000
--- a/tests/data/processed/test04/calls_missed_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_morning_count","call_missed_morning_distinctcontacts","call_missed_morning_timefirstcall","call_missed_morning_timelastcall","call_missed_morning_countmostfrequentcontact"
diff --git a/tests/data/processed/test04/calls_missed_night.csv b/tests/data/processed/test04/calls_missed_night.csv
deleted file mode 100644
index 61557e4e..00000000
--- a/tests/data/processed/test04/calls_missed_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","call_missed_night_count","call_missed_night_distinctcontacts","call_missed_night_timefirstcall","call_missed_night_timelastcall","call_missed_night_countmostfrequentcontact"
diff --git a/tests/data/processed/test04/calls_outgoing_afternoon.csv b/tests/data/processed/test04/calls_outgoing_afternoon.csv
deleted file mode 100644
index 3430c380..00000000
--- a/tests/data/processed/test04/calls_outgoing_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_outgoing_daily.csv b/tests/data/processed/test04/calls_outgoing_daily.csv
deleted file mode 100644
index ed6ee7fa..00000000
--- a/tests/data/processed/test04/calls_outgoing_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_outgoing_evening.csv b/tests/data/processed/test04/calls_outgoing_evening.csv
deleted file mode 100644
index a459636a..00000000
--- a/tests/data/processed/test04/calls_outgoing_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_outgoing_morning.csv b/tests/data/processed/test04/calls_outgoing_morning.csv
deleted file mode 100644
index 0beb5827..00000000
--- a/tests/data/processed/test04/calls_outgoing_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/calls_outgoing_night.csv b/tests/data/processed/test04/calls_outgoing_night.csv
deleted file mode 100644
index fa763f36..00000000
--- a/tests/data/processed/test04/calls_outgoing_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"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"
diff --git a/tests/data/processed/test04/conversation_afternoon.csv b/tests/data/processed/test04/conversation_afternoon.csv
deleted file mode 100644
index 8943c5d0..00000000
--- a/tests/data/processed/test04/conversation_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_afternoon_sdconversationduration,conversation_afternoon_noisesensedfraction,conversation_afternoon_timefirstconversation,conversation_afternoon_noiseexpectedfraction,conversation_afternoon_silencesensedfraction,conversation_afternoon_minutesnoise,conversation_afternoon_voicesensedfraction,conversation_afternoon_silenceexpectedfraction,conversation_afternoon_minutesunknown,conversation_afternoon_minconversationduration,conversation_afternoon_countconversation,conversation_afternoon_maxenergy,conversation_afternoon_sumconversationduration,conversation_afternoon_unknownsensedfraction,conversation_afternoon_sdenergy,conversation_afternoon_minutesvoice,conversation_afternoon_minutessilence,conversation_afternoon_timelastconversation,conversation_afternoon_sumenergy,conversation_afternoon_maxconversationduration,conversation_afternoon_avgenergy,conversation_afternoon_avgconversationduration,conversation_afternoon_minenergy,conversation_afternoon_voiceexpectedfraction,conversation_afternoon_unknownexpectedfraction
diff --git a/tests/data/processed/test04/conversation_daily.csv b/tests/data/processed/test04/conversation_daily.csv
deleted file mode 100644
index 12b01b61..00000000
--- a/tests/data/processed/test04/conversation_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_daily_timelastconversation,conversation_daily_maxenergy,conversation_daily_minutesunknown,conversation_daily_silenceexpectedfraction,conversation_daily_silencesensedfraction,conversation_daily_minutesnoise,conversation_daily_timefirstconversation,conversation_daily_minconversationduration,conversation_daily_voiceexpectedfraction,conversation_daily_minutesvoice,conversation_daily_sumenergy,conversation_daily_avgenergy,conversation_daily_noiseexpectedfraction,conversation_daily_avgconversationduration,conversation_daily_sdenergy,conversation_daily_minutessilence,conversation_daily_countconversation,conversation_daily_maxconversationduration,conversation_daily_sumconversationduration,conversation_daily_unknownexpectedfraction,conversation_daily_voicesensedfraction,conversation_daily_minenergy,conversation_daily_unknownsensedfraction,conversation_daily_noisesensedfraction,conversation_daily_sdconversationduration
diff --git a/tests/data/processed/test04/conversation_evening.csv b/tests/data/processed/test04/conversation_evening.csv
deleted file mode 100644
index d1aa6858..00000000
--- a/tests/data/processed/test04/conversation_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_evening_avgconversationduration,conversation_evening_maxenergy,conversation_evening_minenergy,conversation_evening_minconversationduration,conversation_evening_minutesunknown,conversation_evening_noiseexpectedfraction,conversation_evening_minutesnoise,conversation_evening_noisesensedfraction,conversation_evening_sdconversationduration,conversation_evening_silenceexpectedfraction,conversation_evening_minutesvoice,conversation_evening_unknownsensedfraction,conversation_evening_voicesensedfraction,conversation_evening_sumenergy,conversation_evening_unknownexpectedfraction,conversation_evening_timefirstconversation,conversation_evening_sdenergy,conversation_evening_minutessilence,conversation_evening_maxconversationduration,conversation_evening_countconversation,conversation_evening_silencesensedfraction,conversation_evening_sumconversationduration,conversation_evening_timelastconversation,conversation_evening_avgenergy,conversation_evening_voiceexpectedfraction
diff --git a/tests/data/processed/test04/conversation_morning.csv b/tests/data/processed/test04/conversation_morning.csv
deleted file mode 100644
index e7458450..00000000
--- a/tests/data/processed/test04/conversation_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_morning_silencesensedfraction,conversation_morning_voiceexpectedfraction,conversation_morning_minenergy,conversation_morning_maxconversationduration,conversation_morning_sumenergy,conversation_morning_sdconversationduration,conversation_morning_maxenergy,conversation_morning_timefirstconversation,conversation_morning_silenceexpectedfraction,conversation_morning_minutesvoice,conversation_morning_timelastconversation,conversation_morning_noiseexpectedfraction,conversation_morning_minutessilence,conversation_morning_avgconversationduration,conversation_morning_noisesensedfraction,conversation_morning_countconversation,conversation_morning_sdenergy,conversation_morning_sumconversationduration,conversation_morning_minconversationduration,conversation_morning_unknownsensedfraction,conversation_morning_minutesnoise,conversation_morning_minutesunknown,conversation_morning_avgenergy,conversation_morning_unknownexpectedfraction,conversation_morning_voicesensedfraction
diff --git a/tests/data/processed/test04/conversation_night.csv b/tests/data/processed/test04/conversation_night.csv
deleted file mode 100644
index 33764656..00000000
--- a/tests/data/processed/test04/conversation_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,conversation_night_noisesensedfraction,conversation_night_minutesvoice,conversation_night_maxenergy,conversation_night_voiceexpectedfraction,conversation_night_avgconversationduration,conversation_night_timelastconversation,conversation_night_minutessilence,conversation_night_minutesunknown,conversation_night_avgenergy,conversation_night_noiseexpectedfraction,conversation_night_sumenergy,conversation_night_minenergy,conversation_night_minconversationduration,conversation_night_sdenergy,conversation_night_sumconversationduration,conversation_night_countconversation,conversation_night_voicesensedfraction,conversation_night_maxconversationduration,conversation_night_silencesensedfraction,conversation_night_minutesnoise,conversation_night_unknownsensedfraction,conversation_night_timefirstconversation,conversation_night_silenceexpectedfraction,conversation_night_sdconversationduration,conversation_night_unknownexpectedfraction
diff --git a/tests/data/processed/test04/light_afternoon.csv b/tests/data/processed/test04/light_afternoon.csv
deleted file mode 100644
index da1c58e3..00000000
--- a/tests/data/processed/test04/light_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_afternoon_avglux,light_afternoon_count,light_afternoon_maxlux,light_afternoon_medianlux,light_afternoon_minlux,light_afternoon_stdlux
diff --git a/tests/data/processed/test04/light_daily.csv b/tests/data/processed/test04/light_daily.csv
deleted file mode 100644
index a455b944..00000000
--- a/tests/data/processed/test04/light_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_daily_avglux,light_daily_stdlux,light_daily_medianlux,light_daily_minlux,light_daily_maxlux,light_daily_count
diff --git a/tests/data/processed/test04/light_evening.csv b/tests/data/processed/test04/light_evening.csv
deleted file mode 100644
index c13d87f9..00000000
--- a/tests/data/processed/test04/light_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_evening_avglux,light_evening_minlux,light_evening_maxlux,light_evening_medianlux,light_evening_stdlux,light_evening_count
diff --git a/tests/data/processed/test04/light_morning.csv b/tests/data/processed/test04/light_morning.csv
deleted file mode 100644
index bb3b6662..00000000
--- a/tests/data/processed/test04/light_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_morning_minlux,light_morning_avglux,light_morning_stdlux,light_morning_medianlux,light_morning_count,light_morning_maxlux
diff --git a/tests/data/processed/test04/light_night.csv b/tests/data/processed/test04/light_night.csv
deleted file mode 100644
index 1c4159e5..00000000
--- a/tests/data/processed/test04/light_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,light_night_count,light_night_stdlux,light_night_minlux,light_night_medianlux,light_night_maxlux,light_night_avglux
diff --git a/tests/data/processed/test04/messages_received_afternoon.csv b/tests/data/processed/test04/messages_received_afternoon.csv
deleted file mode 100644
index 640096b5..00000000
--- a/tests/data/processed/test04/messages_received_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_afternoon_countmostfrequentcontact","messages_received_afternoon_count","messages_received_afternoon_distinctcontacts","messages_received_afternoon_timefirstmessage","messages_received_afternoon_timelastmessage"
diff --git a/tests/data/processed/test04/messages_received_daily.csv b/tests/data/processed/test04/messages_received_daily.csv
deleted file mode 100644
index de5543b9..00000000
--- a/tests/data/processed/test04/messages_received_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_daily_countmostfrequentcontact","messages_received_daily_count","messages_received_daily_distinctcontacts","messages_received_daily_timefirstmessage","messages_received_daily_timelastmessage"
diff --git a/tests/data/processed/test04/messages_received_evening.csv b/tests/data/processed/test04/messages_received_evening.csv
deleted file mode 100644
index 7325e9a9..00000000
--- a/tests/data/processed/test04/messages_received_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_evening_countmostfrequentcontact","messages_received_evening_count","messages_received_evening_distinctcontacts","messages_received_evening_timefirstmessage","messages_received_evening_timelastmessage"
diff --git a/tests/data/processed/test04/messages_received_morning.csv b/tests/data/processed/test04/messages_received_morning.csv
deleted file mode 100644
index bbd446c3..00000000
--- a/tests/data/processed/test04/messages_received_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_morning_countmostfrequentcontact","messages_received_morning_count","messages_received_morning_distinctcontacts","messages_received_morning_timefirstmessage","messages_received_morning_timelastmessage"
diff --git a/tests/data/processed/test04/messages_received_night.csv b/tests/data/processed/test04/messages_received_night.csv
deleted file mode 100644
index 2d0ae76f..00000000
--- a/tests/data/processed/test04/messages_received_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_received_night_countmostfrequentcontact","messages_received_night_count","messages_received_night_distinctcontacts","messages_received_night_timefirstmessage","messages_received_night_timelastmessage"
diff --git a/tests/data/processed/test04/messages_sent_afternoon.csv b/tests/data/processed/test04/messages_sent_afternoon.csv
deleted file mode 100644
index ab84aaba..00000000
--- a/tests/data/processed/test04/messages_sent_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_afternoon_countmostfrequentcontact","messages_sent_afternoon_count","messages_sent_afternoon_distinctcontacts","messages_sent_afternoon_timefirstmessage","messages_sent_afternoon_timelastmessage"
diff --git a/tests/data/processed/test04/messages_sent_daily.csv b/tests/data/processed/test04/messages_sent_daily.csv
deleted file mode 100644
index f827b72f..00000000
--- a/tests/data/processed/test04/messages_sent_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_daily_countmostfrequentcontact","messages_sent_daily_count","messages_sent_daily_distinctcontacts","messages_sent_daily_timefirstmessage","messages_sent_daily_timelastmessage"
diff --git a/tests/data/processed/test04/messages_sent_evening.csv b/tests/data/processed/test04/messages_sent_evening.csv
deleted file mode 100644
index ddfed962..00000000
--- a/tests/data/processed/test04/messages_sent_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_evening_countmostfrequentcontact","messages_sent_evening_count","messages_sent_evening_distinctcontacts","messages_sent_evening_timefirstmessage","messages_sent_evening_timelastmessage"
diff --git a/tests/data/processed/test04/messages_sent_morning.csv b/tests/data/processed/test04/messages_sent_morning.csv
deleted file mode 100644
index 80235f96..00000000
--- a/tests/data/processed/test04/messages_sent_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_morning_countmostfrequentcontact","messages_sent_morning_count","messages_sent_morning_distinctcontacts","messages_sent_morning_timefirstmessage","messages_sent_morning_timelastmessage"
diff --git a/tests/data/processed/test04/messages_sent_night.csv b/tests/data/processed/test04/messages_sent_night.csv
deleted file mode 100644
index 1b4351e0..00000000
--- a/tests/data/processed/test04/messages_sent_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","messages_sent_night_countmostfrequentcontact","messages_sent_night_count","messages_sent_night_distinctcontacts","messages_sent_night_timefirstmessage","messages_sent_night_timelastmessage"
diff --git a/tests/data/processed/test04/screen_afternoon.csv b/tests/data/processed/test04/screen_afternoon.csv
deleted file mode 100644
index b1d57552..00000000
--- a/tests/data/processed/test04/screen_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_afternoon_sumdurationunlock,screen_afternoon_countepisodeunlock,screen_afternoon_mindurationunlock,screen_afternoon_episodepersensedminutesunlock,screen_afternoon_maxdurationunlock,screen_afternoon_stddurationunlock,screen_afternoon_firstuseafter00unlock,screen_afternoon_avgdurationunlock
diff --git a/tests/data/processed/test04/screen_daily.csv b/tests/data/processed/test04/screen_daily.csv
deleted file mode 100644
index e0180dc6..00000000
--- a/tests/data/processed/test04/screen_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_daily_firstuseafter00unlock,screen_daily_sumdurationunlock,screen_daily_maxdurationunlock,screen_daily_countepisodeunlock,screen_daily_stddurationunlock,screen_daily_episodepersensedminutesunlock,screen_daily_mindurationunlock,screen_daily_avgdurationunlock
diff --git a/tests/data/processed/test04/screen_deltas.csv b/tests/data/processed/test04/screen_deltas.csv
deleted file mode 100644
index 8209e74c..00000000
--- a/tests/data/processed/test04/screen_deltas.csv
+++ /dev/null
@@ -1 +0,0 @@
-"episode","time_diff","local_start_date_time","local_end_date_time","local_start_date","local_end_date","local_start_day_segment","local_end_day_segment"
diff --git a/tests/data/processed/test04/screen_evening.csv b/tests/data/processed/test04/screen_evening.csv
deleted file mode 100644
index bf8fbea6..00000000
--- a/tests/data/processed/test04/screen_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_evening_episodepersensedminutesunlock,screen_evening_stddurationunlock,screen_evening_mindurationunlock,screen_evening_countepisodeunlock,screen_evening_firstuseafter00unlock,screen_evening_sumdurationunlock,screen_evening_avgdurationunlock,screen_evening_maxdurationunlock
diff --git a/tests/data/processed/test04/screen_morning.csv b/tests/data/processed/test04/screen_morning.csv
deleted file mode 100644
index d5c03303..00000000
--- a/tests/data/processed/test04/screen_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_morning_episodepersensedminutesunlock,screen_morning_maxdurationunlock,screen_morning_countepisodeunlock,screen_morning_avgdurationunlock,screen_morning_sumdurationunlock,screen_morning_mindurationunlock,screen_morning_firstuseafter00unlock,screen_morning_stddurationunlock
diff --git a/tests/data/processed/test04/screen_night.csv b/tests/data/processed/test04/screen_night.csv
deleted file mode 100644
index a3d8eb07..00000000
--- a/tests/data/processed/test04/screen_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-local_date,screen_night_episodepersensedminutesunlock,screen_night_countepisodeunlock,screen_night_maxdurationunlock,screen_night_mindurationunlock,screen_night_sumdurationunlock,screen_night_stddurationunlock,screen_night_firstuseafter00unlock,screen_night_avgdurationunlock
diff --git a/tests/data/processed/test04/wifi_afternoon.csv b/tests/data/processed/test04/wifi_afternoon.csv
deleted file mode 100644
index e23766ae..00000000
--- a/tests/data/processed/test04/wifi_afternoon.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_afternoon_countscans","wifi_afternoon_uniquedevices","wifi_afternoon_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/wifi_daily.csv b/tests/data/processed/test04/wifi_daily.csv
deleted file mode 100644
index 569ec612..00000000
--- a/tests/data/processed/test04/wifi_daily.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_daily_countscans","wifi_daily_uniquedevices","wifi_daily_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/wifi_evening.csv b/tests/data/processed/test04/wifi_evening.csv
deleted file mode 100644
index d2879ba8..00000000
--- a/tests/data/processed/test04/wifi_evening.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_evening_countscans","wifi_evening_uniquedevices","wifi_evening_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/wifi_morning.csv b/tests/data/processed/test04/wifi_morning.csv
deleted file mode 100644
index f34385b1..00000000
--- a/tests/data/processed/test04/wifi_morning.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_morning_countscans","wifi_morning_uniquedevices","wifi_morning_countscansmostuniquedevice"
diff --git a/tests/data/processed/test04/wifi_night.csv b/tests/data/processed/test04/wifi_night.csv
deleted file mode 100644
index c9660149..00000000
--- a/tests/data/processed/test04/wifi_night.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_date","wifi_night_countscans","wifi_night_uniquedevices","wifi_night_countscansmostuniquedevice"
diff --git a/tests/scripts/test_sensor_features.py b/tests/scripts/test_sensor_features.py
index 6219437a..097353d2 100644
--- a/tests/scripts/test_sensor_features.py
+++ b/tests/scripts/test_sensor_features.py
@@ -1,3 +1,4 @@
+from snakemake.io import expand
 import unittest
 import hashlib
 import pandas as pd
@@ -20,17 +21,19 @@ class TestSensorFeatures(unittest.TestCase):
 
     def test_sensors_files_exist(self):
         # Loop through the file_list dictionary and check if the files exist. 
-
+    
         file_lists = utils.generate_sensor_file_lists(configs)
         for each in file_lists:
-            for out_file, _ in file_lists[each]:
-                self.assertEqual(os.path.exists(out_file), 1)
+            #for out_file, _ in file_lists[each]:
+            self.assertEqual(os.path.exists( each[0]), 1)
 
 
     def test_sensors_features_calculations(self):
-        calc_files = utils.generate_sensor_file_lists(configs)
-        for each in calc_files:
-            for act_result, exp_result in calc_files[each]:
+
+                       
+        sensor_file_list = utils.generate_sensor_file_lists(configs)        
+        for each in sensor_file_list:
+            for act_result, exp_result in sensor_file_list:
                 df_act = pd.read_csv(act_result)
                 df_exp = pd.read_csv(exp_result)
                 if df_act.empty:
diff --git a/tests/scripts/utils.py b/tests/scripts/utils.py
index e2b0c7c4..ec653e86 100644
--- a/tests/scripts/utils.py
+++ b/tests/scripts/utils.py
@@ -72,15 +72,15 @@ def generate_file_list(configs, sensor):
     return zip(act_file_list, exp_file_list)
 
 
-def generate_sensor_file_lists(config):
+def generate_sensor_file_lists(configs):
     # Go through the configs and select those sensors with COMPUTE = True.
     # Also get DAY_SEGMENTS, and optionally TYPES then create expected 
     # files. Return dictionary with list of file paths of expected and 
     # actual files for each sensor listed in the config file. Added for Travis.
 
     # Initialize string of file path for both expected and actual metric values
-    act_str = "data/processed/{pid}/{sensor}_{sensor_type}{day_segment}.csv"
-    exp_str = "tests/data/processed/{pid}/{sensor}_{sensor_type}{day_segment}.csv"
+    act_str = "data/processed/features/{pid}/{sensor_key}.csv"
+    exp_str = "tests/data/processed/features/{pid}/{sensor_key}.csv"
 
     # List of available sensors that can be tested by the testing suite
     TESTABLE_SENSORS = ['MESSAGES', 'CALLS', 'SCREEN', 'BATTERY', 'BLUETOOTH', 'WIFI', 'LIGHT', 'APPLICATIONS_FOREGROUND', 'ACTIVITY_RECOGNITION', 'CONVERSATION']
@@ -88,38 +88,14 @@ def generate_sensor_file_lists(config):
     # Build list of sensors to be tested. 
     sensors = []
     for sensor in TESTABLE_SENSORS:
-        if config[sensor]["COMPUTE"] == True:
-            sensors.append(sensor)
+        if sensor in configs.keys():
+            for provider in configs[sensor]["PROVIDERS"]:
+                if configs[sensor]["PROVIDERS"][provider]["COMPUTE"]:
+                    sensors.append(sensor.lower())
 
-    sensor_file_lists = {}
-    
-    # Loop though all sensors and create the actual and expected file paths
-    for sensor in sensors:
-        if 'DAY_SEGMENTS' in config[sensor]:
-            sensor_type = []
-            if 'TYPES' in config[sensor]:
-                for each in config[sensor]['TYPES']:
-                    sensor_type.append(each+'_')
-            lower_sensor = sensor.lower()
-            if sensor_type:
-                act_file_list = expand(act_str, pid=config["PIDS"], 
-                                                sensor = lower_sensor, 
-                                                sensor_type = sensor_type, 
-                                                day_segment = config[sensor]["DAY_SEGMENTS"])
-                exp_file_list = expand(exp_str, pid=config["PIDS"], 
-                                                sensor = lower_sensor, 
-                                                sensor_type = sensor_type, 
-                                                day_segment = config[sensor]["DAY_SEGMENTS"])
-            else:
-                act_file_list = expand(act_str, pid=config["PIDS"], 
-                                                sensor = lower_sensor, 
-                                                sensor_type = '', 
-                                                day_segment = config[sensor]["DAY_SEGMENTS"])
-                exp_file_list = expand(exp_str, pid=config["PIDS"], 
-                                                sensor = lower_sensor, 
-                                                sensor_type = '', 
-                                                day_segment = config[sensor]["DAY_SEGMENTS"])
-
-            sensor_file_lists[sensor] = list(zip(act_file_list,exp_file_list))
+    act_file_list = expand(act_str,pid=configs["PIDS"],sensor_key = sensors)                                
+    exp_file_list = expand(exp_str, pid=configs["PIDS"],sensor_key = sensors)
+    sensor_file_lists = list(zip(act_file_list,exp_file_list))          
+    #sensor_file_lists[sensor] = list(zip(act_file_list,exp_file_list))
 
     return sensor_file_lists
\ No newline at end of file
diff --git a/tests/settings/config.yaml b/tests/settings/config.yaml
index ab817e0b..b19786a3 100644
--- a/tests/settings/config.yaml
+++ b/tests/settings/config.yaml
@@ -2,4 +2,5 @@ directory: ./
 configfile: ./tests/settings/testing_config.yaml
 snakefile: ./tests/Snakefile
 cores: 1
-forcerun: [messages_features, call_features, bluetooth_features, activity_features, battery_features, screen_features, light_features, applications_foreground_features, wifi_features, conversation_features]
\ No newline at end of file
+# forcerun: [messages_features, call_features, bluetooth_features, activity_features, battery_features, screen_features, light_features, applications_foreground_features, wifi_features, conversation_features]
+forcerun: [join_features_from_providers]
\ No newline at end of file
diff --git a/tests/settings/testing_config.yaml b/tests/settings/testing_config.yaml
index 451a8a45..477acd30 100644
--- a/tests/settings/testing_config.yaml
+++ b/tests/settings/testing_config.yaml
@@ -5,100 +5,18 @@ PIDS: [test01, test02, test03, test04]
 
 # Global var with common day segments
 DAY_SEGMENTS: &day_segments
-  [daily, morning, afternoon, evening, night]
+  TYPE: INTERVAL_EVERY_DAY # FREQUENCY_EVERY_DAY, INTERVAL_EVERY_DAY, INTERVAL_FLEXIBLE_DAY
+  FILE: "data/external/daysegments_interval.csv"
 
 PHONE_VALID_SENSED_BINS:
-  DB_TABLES: [messages, calls, screen, battery, bluetooth, wifi, light, applications_foreground]
-
-# Communication SMS features config, TYPES and FEATURES keys need to match
-MESSAGES:
-  COMPUTE: True
-  DB_TABLE: messages
-  TYPES : [received, sent]
-  FEATURES: 
-    received: [count, distinctcontacts, timefirstmessage, timelastmessage, countmostfrequentcontact]
-    sent: [count, distinctcontacts, timefirstmessage, timelastmessage, countmostfrequentcontact]
-  DAY_SEGMENTS: *day_segments  
-
-# Communication call features config, TYPES and FEATURES keys need to match
-CALLS:
-  COMPUTE: True
-  DB_TABLE: calls
-  TYPES: [missed, incoming, outgoing]
-  FEATURES:
-    missed:  [count, distinctcontacts, timefirstcall, timelastcall, countmostfrequentcontact]
-    incoming: [count, distinctcontacts, meanduration, sumduration, minduration, maxduration, stdduration, modeduration, entropyduration, timefirstcall, timelastcall, countmostfrequentcontact]
-    outgoing: [count, distinctcontacts, meanduration, sumduration, minduration, maxduration, stdduration, modeduration, entropyduration, timefirstcall, timelastcall, countmostfrequentcontact]
-  DAY_SEGMENTS: *day_segments
+  DB_TABLES: [bluetooth]
 
 BLUETOOTH:
-  COMPUTE: True
   DB_TABLE: bluetooth
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
+  PROVIDERS:
+    RAPIDS:
+      COMPUTE: True
+      FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
+      SRC_FOLDER: "rapids" # inside src/features/bluetooth
+      SRC_LANGUAGE: "r"
 
-ACTIVITY_RECOGNITION:
-  COMPUTE: True
-  DB_TABLE: 
-    ANDROID: plugin_google_activity_recognition
-    IOS: plugin_ios_activity_recognition
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["count","mostcommonactivity","countuniqueactivities","activitychangecount","sumstationary","summobile","sumvehicle"]
-
-BATTERY:
-  COMPUTE: True
-  DB_TABLE: battery
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["countdischarge", "sumdurationdischarge", "countcharge", "sumdurationcharge", "avgconsumptionrate", "maxconsumptionrate"]
-
-SCREEN:
-  COMPUTE: True
-  DB_TABLE: screen
-  DAY_SEGMENTS: *day_segments
-  REFERENCE_HOUR_FIRST_USE: 0
-  IGNORE_EPISODES_SHORTER_THAN: 0 # in minutes, set to 0 to disable
-  IGNORE_EPISODES_LONGER_THAN: 0 # in minutes, set to 0 to disable
-  FEATURES_DELTAS: ["countepisode", "episodepersensedminutes", "sumduration", "maxduration", "minduration", "avgduration", "stdduration", "firstuseafter"]
-  EPISODE_TYPES: ["unlock"]
-
-LIGHT:
-  COMPUTE: True
-  DB_TABLE: light
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["count", "maxlux", "minlux", "avglux", "medianlux", "stdlux"]
-
-APPLICATIONS_FOREGROUND:
-  COMPUTE: True
-  DB_TABLE: applications_foreground
-  DAY_SEGMENTS: *day_segments
-  SINGLE_CATEGORIES: ["all", "email"]
-  MULTIPLE_CATEGORIES:
-    social: ["socialnetworks", "socialmediatools"]
-    entertainment: ["entertainment", "gamingstrategy"]
-  SINGLE_APPS: ["top1global", "com.facebook.moments", "com.google.android.youtube"] # There's no entropy for single apps
-  EXCLUDED_CATEGORIES: ["systemapp", "tvvideoapps"]
-  EXCLUDED_APPS: ["com.fitbit.FitbitMobile", "com.aware.plugin.upmc.cancer"]
-  FEATURES: ["count", "timeoffirstuse", "timeoflastuse", "frequencyentropy"]
-
-WIFI:
-  COMPUTE: True
-  DB_TABLE: 
-    VISIBLE_ACCESS_POINTS: "wifi" # if you only have a CONNECTED_ACCESS_POINTS table, set this value to ""
-    CONNECTED_ACCESS_POINTS: "sensor_wifi" # if you only have a VISIBLE_ACCESS_POINTS table, set this value to ""
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
-
-
-CONVERSATION:
-  COMPUTE: True
-  DB_TABLE: 
-    ANDROID: plugin_studentlife_audio_android
-    IOS: plugin_studentlife_audio
-  DAY_SEGMENTS: *day_segments
-  FEATURES: ["minutessilence", "minutesnoise", "minutesvoice", "minutesunknown","sumconversationduration","avgconversationduration",
-    "sdconversationduration","minconversationduration","maxconversationduration","timefirstconversation","timelastconversation","sumenergy",
-    "avgenergy","sdenergy","minenergy","maxenergy","silencesensedfraction","noisesensedfraction",
-    "voicesensedfraction","unknownsensedfraction","silenceexpectedfraction","noiseexpectedfraction","voiceexpectedfraction",
-    "unknownexpectedfraction","countconversation"]
-  RECORDINGMINUTES: 1
-  PAUSEDMINUTES : 3