diff --git a/tests/data/processed/features/frequency/test03/applications_foreground.csv b/tests/data/processed/features/frequency/test03/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test03/applications_foreground.csv
rename to tests/data/processed/features/frequency/test03/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/frequency/test03/wifi.csv b/tests/data/processed/features/frequency/test03/phone_wifi_connected.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test03/wifi.csv
rename to tests/data/processed/features/frequency/test03/phone_wifi_connected.csv
diff --git a/tests/data/processed/features/frequency/test04/wifi.csv b/tests/data/processed/features/frequency/test03/phone_wifi_visible.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test04/wifi.csv
rename to tests/data/processed/features/frequency/test03/phone_wifi_visible.csv
diff --git a/tests/data/processed/features/frequency/test04/applications_foreground.csv b/tests/data/processed/features/frequency/test04/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test04/applications_foreground.csv
rename to tests/data/processed/features/frequency/test04/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/frequency/test04/phone_wifi_connected.csv b/tests/data/processed/features/frequency/test04/phone_wifi_connected.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/frequency/test04/phone_wifi_connected.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/frequency/test04/phone_wifi_visible.csv b/tests/data/processed/features/frequency/test04/phone_wifi_visible.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/frequency/test04/phone_wifi_visible.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/frequency/test05/applications_foreground.csv b/tests/data/processed/features/frequency/test05/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test05/applications_foreground.csv
rename to tests/data/processed/features/frequency/test05/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/frequency/test05/wifi.csv b/tests/data/processed/features/frequency/test05/phone_wifi_connected.csv
similarity index 93%
rename from tests/data/processed/features/frequency/test05/wifi.csv
rename to tests/data/processed/features/frequency/test05/phone_wifi_connected.csv
index cb79321c..b19b20b6 100644
--- a/tests/data/processed/features/frequency/test05/wifi.csv
+++ b/tests/data/processed/features/frequency/test05/phone_wifi_connected.csv
@@ -1,6 +1,6 @@
 "local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
 "thirtyminutes0000#2020-10-12 00:00:00,2020-10-12 00:29:59","thirtyminutes0000","2020-10-12 00:00:00","2020-10-12 00:29:59",6,4,2
-"thirtyminutes0000#2020-10-13 00:00:00,2020-10-13 00:29:59","thirtyminutes0000","2020-10-13 00:00:00","2020-10-13 00:29:59",2,2,NA
+"thirtyminutes0000#2020-10-13 00:00:00,2020-10-13 00:29:59","thirtyminutes0000","2020-10-13 00:00:00","2020-10-13 00:29:59",2,1,2
 "thirtyminutes0001#2020-10-12 00:30:00,2020-10-12 00:59:59","thirtyminutes0001","2020-10-12 00:30:00","2020-10-12 00:59:59",6,6,1
 "thirtyminutes0001#2020-10-13 00:30:00,2020-10-13 00:59:59","thirtyminutes0001","2020-10-13 00:30:00","2020-10-13 00:59:59",2,2,1
 "thirtyminutes0002#2020-10-12 01:00:00,2020-10-12 01:29:59","thirtyminutes0002","2020-10-12 01:00:00","2020-10-12 01:29:59",4,4,1
diff --git a/tests/data/processed/features/frequency/test06/wifi.csv b/tests/data/processed/features/frequency/test05/phone_wifi_visible.csv
similarity index 58%
rename from tests/data/processed/features/frequency/test06/wifi.csv
rename to tests/data/processed/features/frequency/test05/phone_wifi_visible.csv
index add86a99..b19b20b6 100644
--- a/tests/data/processed/features/frequency/test06/wifi.csv
+++ b/tests/data/processed/features/frequency/test05/phone_wifi_visible.csv
@@ -1,8 +1,8 @@
 "local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
-"thirtyminutes0000#2020-10-12 00:00:00,2020-10-12 00:29:59","thirtyminutes0000","2020-10-12 00:00:00","2020-10-12 00:29:59",3,2,2
-"thirtyminutes0000#2020-10-13 00:00:00,2020-10-13 00:29:59","thirtyminutes0000","2020-10-13 00:00:00","2020-10-13 00:29:59",1,1,NA
-"thirtyminutes0001#2020-10-12 00:30:00,2020-10-12 00:59:59","thirtyminutes0001","2020-10-12 00:30:00","2020-10-12 00:59:59",3,3,1
-"thirtyminutes0001#2020-10-13 00:30:00,2020-10-13 00:59:59","thirtyminutes0001","2020-10-13 00:30:00","2020-10-13 00:59:59",1,1,1
-"thirtyminutes0002#2020-10-12 01:00:00,2020-10-12 01:29:59","thirtyminutes0002","2020-10-12 01:00:00","2020-10-12 01:29:59",2,2,1
-"thirtyminutes0046#2020-10-12 23:00:00,2020-10-12 23:29:59","thirtyminutes0046","2020-10-12 23:00:00","2020-10-12 23:29:59",3,2,2
-"thirtyminutes0047#2020-10-12 23:30:00,2020-10-12 23:59:59","thirtyminutes0047","2020-10-12 23:30:00","2020-10-12 23:59:59",3,3,1
+"thirtyminutes0000#2020-10-12 00:00:00,2020-10-12 00:29:59","thirtyminutes0000","2020-10-12 00:00:00","2020-10-12 00:29:59",6,4,2
+"thirtyminutes0000#2020-10-13 00:00:00,2020-10-13 00:29:59","thirtyminutes0000","2020-10-13 00:00:00","2020-10-13 00:29:59",2,1,2
+"thirtyminutes0001#2020-10-12 00:30:00,2020-10-12 00:59:59","thirtyminutes0001","2020-10-12 00:30:00","2020-10-12 00:59:59",6,6,1
+"thirtyminutes0001#2020-10-13 00:30:00,2020-10-13 00:59:59","thirtyminutes0001","2020-10-13 00:30:00","2020-10-13 00:59:59",2,2,1
+"thirtyminutes0002#2020-10-12 01:00:00,2020-10-12 01:29:59","thirtyminutes0002","2020-10-12 01:00:00","2020-10-12 01:29:59",4,4,1
+"thirtyminutes0046#2020-10-12 23:00:00,2020-10-12 23:29:59","thirtyminutes0046","2020-10-12 23:00:00","2020-10-12 23:29:59",6,4,2
+"thirtyminutes0047#2020-10-12 23:30:00,2020-10-12 23:59:59","thirtyminutes0047","2020-10-12 23:30:00","2020-10-12 23:59:59",6,4,2
diff --git a/tests/data/processed/features/frequency/test06/applications_foreground.csv b/tests/data/processed/features/frequency/test06/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/frequency/test06/applications_foreground.csv
rename to tests/data/processed/features/frequency/test06/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/frequency/test06/phone_wifi_connected.csv b/tests/data/processed/features/frequency/test06/phone_wifi_connected.csv
new file mode 100644
index 00000000..b19b20b6
--- /dev/null
+++ b/tests/data/processed/features/frequency/test06/phone_wifi_connected.csv
@@ -0,0 +1,8 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
+"thirtyminutes0000#2020-10-12 00:00:00,2020-10-12 00:29:59","thirtyminutes0000","2020-10-12 00:00:00","2020-10-12 00:29:59",6,4,2
+"thirtyminutes0000#2020-10-13 00:00:00,2020-10-13 00:29:59","thirtyminutes0000","2020-10-13 00:00:00","2020-10-13 00:29:59",2,1,2
+"thirtyminutes0001#2020-10-12 00:30:00,2020-10-12 00:59:59","thirtyminutes0001","2020-10-12 00:30:00","2020-10-12 00:59:59",6,6,1
+"thirtyminutes0001#2020-10-13 00:30:00,2020-10-13 00:59:59","thirtyminutes0001","2020-10-13 00:30:00","2020-10-13 00:59:59",2,2,1
+"thirtyminutes0002#2020-10-12 01:00:00,2020-10-12 01:29:59","thirtyminutes0002","2020-10-12 01:00:00","2020-10-12 01:29:59",4,4,1
+"thirtyminutes0046#2020-10-12 23:00:00,2020-10-12 23:29:59","thirtyminutes0046","2020-10-12 23:00:00","2020-10-12 23:29:59",6,4,2
+"thirtyminutes0047#2020-10-12 23:30:00,2020-10-12 23:59:59","thirtyminutes0047","2020-10-12 23:30:00","2020-10-12 23:59:59",6,4,2
diff --git a/tests/data/processed/features/frequency/test06/phone_wifi_visible.csv b/tests/data/processed/features/frequency/test06/phone_wifi_visible.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/frequency/test06/phone_wifi_visible.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test01/applications_foreground.csv b/tests/data/processed/features/periodic/test01/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/periodic/test01/applications_foreground.csv
rename to tests/data/processed/features/periodic/test01/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/periodic/test01/wifi.csv b/tests/data/processed/features/periodic/test01/phone_wifi_connected.csv
similarity index 69%
rename from tests/data/processed/features/periodic/test01/wifi.csv
rename to tests/data/processed/features/periodic/test01/phone_wifi_connected.csv
index 34bbe587..ff2fe035 100644
--- a/tests/data/processed/features/periodic/test01/wifi.csv
+++ b/tests/data/processed/features/periodic/test01/phone_wifi_connected.csv
@@ -1,6 +1,6 @@
 "local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
-"afternoon#2020-07-03 12:00:00,2020-07-03 17:59:59","afternoon","2020-07-03 12:00:00","2020-07-03 17:59:59",4,4,1
-"daily#2020-07-03 00:00:00,2020-07-03 23:59:59","daily","2020-07-03 00:00:00","2020-07-03 23:59:59",26,10,6
-"evening#2020-07-03 18:00:00,2020-07-03 23:59:59","evening","2020-07-03 18:00:00","2020-07-03 23:59:59",7,6,2
-"morning#2020-07-03 06:00:00,2020-07-03 11:59:59","morning","2020-07-03 06:00:00","2020-07-03 11:59:59",7,5,2
-"night#2020-07-03 00:00:00,2020-07-03 05:59:59","night","2020-07-03 00:00:00","2020-07-03 05:59:59",8,6,2
+"afternoon#2020-07-03 12:00:00,2020-07-03 17:59:59","afternoon","2020-07-03 12:00:00","2020-07-03 17:59:59",2,2,1
+"daily#2020-07-03 00:00:00,2020-07-03 23:59:59","daily","2020-07-03 00:00:00","2020-07-03 23:59:59",12,5,4
+"evening#2020-07-03 18:00:00,2020-07-03 23:59:59","evening","2020-07-03 18:00:00","2020-07-03 23:59:59",4,3,2
+"morning#2020-07-03 06:00:00,2020-07-03 11:59:59","morning","2020-07-03 06:00:00","2020-07-03 11:59:59",3,2,2
+"night#2020-07-03 00:00:00,2020-07-03 05:59:59","night","2020-07-03 00:00:00","2020-07-03 05:59:59",3,2,2
diff --git a/tests/data/processed/features/periodic/test01/phone_wifi_visible.csv b/tests/data/processed/features/periodic/test01/phone_wifi_visible.csv
new file mode 100644
index 00000000..b602f6d3
--- /dev/null
+++ b/tests/data/processed/features/periodic/test01/phone_wifi_visible.csv
@@ -0,0 +1,6 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
+"afternoon#2020-07-03 12:00:00,2020-07-03 17:59:59","afternoon","2020-07-03 12:00:00","2020-07-03 17:59:59",2,2,1
+"daily#2020-07-03 00:00:00,2020-07-03 23:59:59","daily","2020-07-03 00:00:00","2020-07-03 23:59:59",14,5,6
+"evening#2020-07-03 18:00:00,2020-07-03 23:59:59","evening","2020-07-03 18:00:00","2020-07-03 23:59:59",3,3,1
+"morning#2020-07-03 06:00:00,2020-07-03 11:59:59","morning","2020-07-03 06:00:00","2020-07-03 11:59:59",4,3,2
+"night#2020-07-03 00:00:00,2020-07-03 05:59:59","night","2020-07-03 00:00:00","2020-07-03 05:59:59",5,4,2
diff --git a/tests/data/processed/features/periodic/test02/applications_foreground.csv b/tests/data/processed/features/periodic/test02/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/periodic/test02/applications_foreground.csv
rename to tests/data/processed/features/periodic/test02/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/periodic/test02/wifi.csv b/tests/data/processed/features/periodic/test02/phone_wifi_connected.csv
similarity index 100%
rename from tests/data/processed/features/periodic/test02/wifi.csv
rename to tests/data/processed/features/periodic/test02/phone_wifi_connected.csv
diff --git a/tests/data/processed/features/periodic/test02/phone_wifi_visible.csv b/tests/data/processed/features/periodic/test02/phone_wifi_visible.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/periodic/test02/phone_wifi_visible.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test03/applications_foreground.csv b/tests/data/processed/features/periodic/test03/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/periodic/test03/applications_foreground.csv
rename to tests/data/processed/features/periodic/test03/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/periodic/test03/phone_wifi_connected.csv b/tests/data/processed/features/periodic/test03/phone_wifi_connected.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/periodic/test03/phone_wifi_connected.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test03/phone_wifi_visible.csv b/tests/data/processed/features/periodic/test03/phone_wifi_visible.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/periodic/test03/phone_wifi_visible.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test03/wifi.csv b/tests/data/processed/features/periodic/test03/wifi.csv
deleted file mode 100644
index 89fa0200..00000000
--- a/tests/data/processed/features/periodic/test03/wifi.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test04/applications_foreground.csv b/tests/data/processed/features/periodic/test04/phone_applications_foreground.csv
similarity index 100%
rename from tests/data/processed/features/periodic/test04/applications_foreground.csv
rename to tests/data/processed/features/periodic/test04/phone_applications_foreground.csv
diff --git a/tests/data/processed/features/periodic/test04/phone_wifi_connected.csv b/tests/data/processed/features/periodic/test04/phone_wifi_connected.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/periodic/test04/phone_wifi_connected.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test04/phone_wifi_visible.csv b/tests/data/processed/features/periodic/test04/phone_wifi_visible.csv
new file mode 100644
index 00000000..bdd5ff23
--- /dev/null
+++ b/tests/data/processed/features/periodic/test04/phone_wifi_visible.csv
@@ -0,0 +1 @@
+"local_segment","local_segment_label","local_segment_start_datetime","local_segment_end_datetime","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/processed/features/periodic/test04/wifi.csv b/tests/data/processed/features/periodic/test04/wifi.csv
deleted file mode 100644
index 89fa0200..00000000
--- a/tests/data/processed/features/periodic/test04/wifi.csv
+++ /dev/null
@@ -1 +0,0 @@
-"local_segment","local_segment_label","local_start_date","local_start_time","local_end_date","local_end_time","wifi_rapids_countscans","wifi_rapids_uniquedevices","wifi_rapids_countscansmostuniquedevice"
diff --git a/tests/data/raw/test01/applications_foreground_raw.csv b/tests/data/raw/test01/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test01/applications_foreground_raw.csv
rename to tests/data/raw/test01/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test01/sensor_wifi_raw.csv b/tests/data/raw/test01/phone_wifi_connected_raw.csv
similarity index 100%
rename from tests/data/raw/test01/sensor_wifi_raw.csv
rename to tests/data/raw/test01/phone_wifi_connected_raw.csv
diff --git a/tests/data/raw/test01/wifi_raw.csv b/tests/data/raw/test01/phone_wifi_visible_raw.csv
similarity index 100%
rename from tests/data/raw/test01/wifi_raw.csv
rename to tests/data/raw/test01/phone_wifi_visible_raw.csv
diff --git a/tests/data/raw/test02/applications_foreground_raw.csv b/tests/data/raw/test02/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test02/applications_foreground_raw.csv
rename to tests/data/raw/test02/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test02/sensor_wifi_raw.csv b/tests/data/raw/test02/phone_wifi_connected_raw.csv
similarity index 100%
rename from tests/data/raw/test02/sensor_wifi_raw.csv
rename to tests/data/raw/test02/phone_wifi_connected_raw.csv
diff --git a/tests/data/raw/test02/wifi_raw.csv b/tests/data/raw/test02/phone_wifi_visible_raw.csv
similarity index 100%
rename from tests/data/raw/test02/wifi_raw.csv
rename to tests/data/raw/test02/phone_wifi_visible_raw.csv
diff --git a/tests/data/raw/test03/applications_foreground_raw.csv b/tests/data/raw/test03/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test03/applications_foreground_raw.csv
rename to tests/data/raw/test03/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test03/sensor_wifi_raw.csv b/tests/data/raw/test03/phone_wifi_connected_raw.csv
similarity index 100%
rename from tests/data/raw/test03/sensor_wifi_raw.csv
rename to tests/data/raw/test03/phone_wifi_connected_raw.csv
diff --git a/tests/data/raw/test03/wifi_raw.csv b/tests/data/raw/test03/phone_wifi_visible_raw.csv
similarity index 100%
rename from tests/data/raw/test03/wifi_raw.csv
rename to tests/data/raw/test03/phone_wifi_visible_raw.csv
diff --git a/tests/data/raw/test04/applications_foreground_raw.csv b/tests/data/raw/test04/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test04/applications_foreground_raw.csv
rename to tests/data/raw/test04/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test04/sensor_wifi_raw.csv b/tests/data/raw/test04/phone_wifi_connected_raw.csv
similarity index 100%
rename from tests/data/raw/test04/sensor_wifi_raw.csv
rename to tests/data/raw/test04/phone_wifi_connected_raw.csv
diff --git a/tests/data/raw/test04/wifi_raw.csv b/tests/data/raw/test04/phone_wifi_visible_raw.csv
similarity index 100%
rename from tests/data/raw/test04/wifi_raw.csv
rename to tests/data/raw/test04/phone_wifi_visible_raw.csv
diff --git a/tests/data/raw/test05/applications_foreground_raw.csv b/tests/data/raw/test05/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test05/applications_foreground_raw.csv
rename to tests/data/raw/test05/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test05/phone_wifi_connected_raw.csv b/tests/data/raw/test05/phone_wifi_connected_raw.csv
new file mode 100644
index 00000000..9e2df5ec
--- /dev/null
+++ b/tests/data/raw/test05/phone_wifi_connected_raw.csv
@@ -0,0 +1,33 @@
+timestamp,device_id,mac_address,ssid,bssid
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,CMU-SECURE,d0:b8:2f:eb:0e:f8
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,,3d:12:ec:de:96:e1
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,,3d:12:ec:de:96:e1
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,eduroam,24:2b:a2:55:8a:e0
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,CMU-SECURE,d0:b8:2f:eb:0e:f8
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
diff --git a/tests/data/raw/test05/phone_wifi_visible_raw.csv b/tests/data/raw/test05/phone_wifi_visible_raw.csv
new file mode 100644
index 00000000..5d1d1e2d
--- /dev/null
+++ b/tests/data/raw/test05/phone_wifi_visible_raw.csv
@@ -0,0 +1,33 @@
+timestamp,device_id,bssid,ssid,security,frequency,rssi,label
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E0:A9:8A:1E:48:1B,HOME-1234,[WPA2-EAP-CCMP][ESS],5805,-95,
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E0:A9:8A:1E:48:1B,HOME-1234,[WPA2-EAP-CCMP][ESS],5180,-93,
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,0D:FB:75:AA:43:0A,Stewart Family,[WPA2-EAP-CCMP][ESS],5765,-83,
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,EF:E7:56:4A:F4:1D,NETGEAR07,[WPA2-EAP-CCMP][ESS],5765,-97,
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,48:6B:8C:51:08:F2,Fios-H4S9a,[WPA2-EAP-CCMP][ESS],5765,-98,
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E0:A9:8A:1E:48:1B,HOME-1234,[WPA2-EAP-CCMP][ESS],5765,-79,
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,0D:FB:75:AA:43:0A,Stewart Family,[WPA2-EAP-CCMP][ESS],5765,-80,
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,48:6B:8C:51:08:F2,Fios-H4S9a,[WPA2-EAP-CCMP][ESS],5180,-82,
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,EF:E7:56:4A:F4:1D,NETGEAR07,[WPA2-EAP-CCMP][ESS],5180,-92,
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,EF:E7:56:4A:F4:1D,NETGEAR07,[WPA2-EAP-CCMP][ESS],5805,-84,
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E6:4C:9A:3F:D0:1B,Galactica,[WPA2-EAP-CCMP][ESS],5765,-91,
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,EF:E7:56:4A:F4:1D,NETGEAR07,[WPA2-EAP-CCMP][ESS],5805,-100,
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,EF:E7:56:4A:F4:1D,NETGEAR07,[WPA2-EAP-CCMP][ESS],5765,-75,
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,0D:FB:75:AA:43:0A,Stewart Family,[WPA2-EAP-CCMP][ESS],5180,-93,
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E6:4C:9A:3F:D0:1B,Galactica,[WPA2-EAP-CCMP][ESS],5765,-80,
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E0:A9:8A:1E:48:1B,HOME-1234,[WPA2-EAP-CCMP][ESS],,,
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],,,
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,d0:b8:2f:eb:0e:f8,CMU-SECURE,[WPA2-EAP-CCMP][ESS],,,
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3d:12:ec:de:96:e1,,[WPA2-EAP-CCMP][ESS],,,
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],,,
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3d:12:ec:de:96:e1,,[WPA2-EAP-CCMP][ESS],,,
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],,,
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,24:2b:a2:55:8a:e0,eduroam,[WPA2-EAP-CCMP][ESS],,,
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,d0:b8:2f:eb:0e:f8,CMU-SECURE,[WPA2-EAP-CCMP][ESS],,,
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],,,
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,E0:A9:8A:1E:48:1B,HOME-1234,,,,
\ No newline at end of file
diff --git a/tests/data/raw/test05/sensor_wifi_raw.csv b/tests/data/raw/test05/sensor_wifi_raw.csv
deleted file mode 100644
index 8e13ca04..00000000
--- a/tests/data/raw/test05/sensor_wifi_raw.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-timestamp,device_id,mac_address,ssid,bssid
-1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
-1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
-1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
-1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
-1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
-1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
-1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
-1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
-1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
-1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
-1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
-1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
-1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
-1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
-1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,ZZ:A9:8A:1E:48:1B
-1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
\ No newline at end of file
diff --git a/tests/data/raw/test05/wifi_raw.csv b/tests/data/raw/test05/wifi_raw.csv
deleted file mode 100644
index c7037b3f..00000000
--- a/tests/data/raw/test05/wifi_raw.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-timestamp,device_id,bssid,ssid,security,frequency,rssi,label
-1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5180,-89,
-1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],5805,-95,
-1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5180,-93,
-1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,d0:b8:2f:eb:0e:f8,CMU-SECURE,[WPA2-EAP-CCMP][ESS],5765,-83,
-1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3d:12:ec:de:96:e1,,[WPA2-EAP-CCMP][ESS],5765,-97,
-1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5765,-98,
-1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],5765,-79,
-1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3d:12:ec:de:96:e1,,[WPA2-EAP-CCMP][ESS],5765,-80,
-1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5180,-82,
-1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5180,-92,
-1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,86:90:7b:8a:3e:43,WIRELESS-PITTNET,[WPA2-EAP-CCMP][ESS],5805,-84,
-1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5765,-91,
-1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,24:2b:a2:55:8a:e0,eduroam,[WPA2-EAP-CCMP][ESS],5805,-100,
-1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,e6:06:da:af:f9:91,xfinity,[WPA2-EAP-CCMP][ESS],5180,-93,
-1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,3d:12:ec:de:96:e1,,[WPA2-EAP-CCMP][ESS],5765,-80,
-1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,d0:b8:2f:eb:0e:f8,CMU-SECURE,[WPA2-EAP-CCMP][ESS],5765,-75,
\ No newline at end of file
diff --git a/tests/data/raw/test06/applications_foreground_raw.csv b/tests/data/raw/test06/phone_applications_foreground_raw.csv
similarity index 100%
rename from tests/data/raw/test06/applications_foreground_raw.csv
rename to tests/data/raw/test06/phone_applications_foreground_raw.csv
diff --git a/tests/data/raw/test06/phone_wifi_connected_raw.csv b/tests/data/raw/test06/phone_wifi_connected_raw.csv
new file mode 100644
index 00000000..9e2df5ec
--- /dev/null
+++ b/tests/data/raw/test06/phone_wifi_connected_raw.csv
@@ -0,0 +1,33 @@
+timestamp,device_id,mac_address,ssid,bssid
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Fios-H4S9a,48:6B:8C:51:08:F2
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,NETGEAR07,EF:E7:56:4A:F4:1D
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Stewart Family,0D:FB:75:AA:43:0A
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,Galactica,E6:4C:9A:3F:D0:1B
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
+1602475200000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602475999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602476999000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602477000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,CMU-SECURE,d0:b8:2f:eb:0e:f8
+1602478000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,,3d:12:ec:de:96:e1
+1602480500000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602478799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602478800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,,3d:12:ec:de:96:e1
+1602558000000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602558799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602559799000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7b:8a:3e:43
+1602559800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602560800000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,eduroam,24:2b:a2:55:8a:e0
+1602563400000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,CMU-SECURE,d0:b8:2f:eb:0e:f8
+1602561599000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,xfinity,e6:06:da:af:f9:91
+1602561600000,wYESbVwI-4GfR-G5I6-7iKL-tOmCKs02MBun,af:13:50:8b:5f:ab,HOME-1234,E0:A9:8A:1E:48:1B
diff --git a/tests/data/raw/test06/wifi_raw.csv b/tests/data/raw/test06/phone_wifi_visible_raw.csv
similarity index 100%
rename from tests/data/raw/test06/wifi_raw.csv
rename to tests/data/raw/test06/phone_wifi_visible_raw.csv
diff --git a/tests/data/raw/test06/sensor_wifi_raw.csv b/tests/data/raw/test06/sensor_wifi_raw.csv
deleted file mode 100644
index 1f651f2f..00000000
--- a/tests/data/raw/test06/sensor_wifi_raw.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-timestamp,device_id,mac_address,ssid,bssid
-1602475200000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,xfinity,E6:06:DA:AF:F9:91
-1602475999000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,xfinity,E6:06:DA:AF:F9:91
-1602476999000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,CMU-SECURE,D0:B8:2F:EB:0E:F8
-1602477000000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,,3D:12:EC:DE:96:E1
-1602478000000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,eduroam,24:2B:A2:55:8A:E0
-1602480500000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,xfinity,E6:06:DA:AF:F9:91
-1602478799000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,CMU-SECURE,D0:B8:2F:EB:0E:F8
-1602478800000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,eduroam,24:2B:A2:55:8A:E0
-1602558000000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,,3D:12:EC:DE:96:E1
-1602558799000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,,3D:12:EC:DE:96:E1
-1602559799000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7B:8A:3E:43
-1602559800000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,,3D:12:EC:DE:96:E1
-1602560800000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,eduroam,24:2B:A2:55:8A:E0
-1602561599000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,xfinity,E6:06:DA:AF:F9:91
-1602561600000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,WIRELESS-PITTNET,86:90:7B:8A:3E:43
-1602563400000,7yKzcQm4-xKTC-0bhC-PZXC-3jAbRIXOsf5w,af:13:50:8b:5f:ab,CMU-SECURE,D0:B8:2F:EB:0E:F8
\ No newline at end of file
diff --git a/tests/settings/frequency/testing_config.yaml b/tests/settings/frequency/testing_config.yaml
index 9b912ebf..869a4ee6 100644
--- a/tests/settings/frequency/testing_config.yaml
+++ b/tests/settings/frequency/testing_config.yaml
@@ -181,13 +181,13 @@ PHONE_APPLICATIONS_FOREGROUND:
     SCRAPE_MISSING_CATEGORIES: False # whether or not to scrape missing genres, only effective if CATALOGUE_SOURCE is equal to FILE. If CATALOGUE_SOURCE is equal to GOOGLE, all genres are scraped anyway
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       SINGLE_CATEGORIES: ["all", "email"]
       MULTIPLE_CATEGORIES:
         social: ["socialnetworks", "socialmediatools"]
-        entertainment: ["entertainment", "gamingknowledge", "gamingcasual", "gamingadventure", "gamingstrategy", "gamingtoolscommunity", "gamingroleplaying", "gamingaction", "gaminglogic", "gamingsports", "gamingsimulation"]
-      SINGLE_APPS: ["top1global", "com.facebook.moments", "com.google.android.youtube", "com.twitter.android"] # There's no entropy for single apps
-      EXCLUDED_CATEGORIES: []
+        entertainment: ["entertainment", "gamingstrategy"]
+      SINGLE_APPS: ["top1global", "com.facebook.moments"] # 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"]
       SRC_FOLDER: "rapids" # inside src/features/phone_applications_foreground
@@ -197,7 +197,7 @@ PHONE_WIFI_VISIBLE:
   DB_TABLE: "wifi"
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
       SRC_FOLDER: "rapids" # inside src/features/phone_wifi_visible
       SRC_LANGUAGE: "r"
@@ -206,7 +206,7 @@ PHONE_WIFI_CONNECTED:
   DB_TABLE: "sensor_wifi"
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
       SRC_FOLDER: "rapids" # inside src/features/phone_wifi_connected
       SRC_LANGUAGE: "r"
diff --git a/tests/settings/periodic/testing_config.yaml b/tests/settings/periodic/testing_config.yaml
index a175ad90..1004fbf6 100644
--- a/tests/settings/periodic/testing_config.yaml
+++ b/tests/settings/periodic/testing_config.yaml
@@ -181,13 +181,13 @@ PHONE_APPLICATIONS_FOREGROUND:
     SCRAPE_MISSING_CATEGORIES: False # whether or not to scrape missing genres, only effective if CATALOGUE_SOURCE is equal to FILE. If CATALOGUE_SOURCE is equal to GOOGLE, all genres are scraped anyway
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       SINGLE_CATEGORIES: ["all", "email"]
       MULTIPLE_CATEGORIES:
         social: ["socialnetworks", "socialmediatools"]
-        entertainment: ["entertainment", "gamingknowledge", "gamingcasual", "gamingadventure", "gamingstrategy", "gamingtoolscommunity", "gamingroleplaying", "gamingaction", "gaminglogic", "gamingsports", "gamingsimulation"]
-      SINGLE_APPS: ["top1global", "com.facebook.moments", "com.google.android.youtube", "com.twitter.android"] # There's no entropy for single apps
-      EXCLUDED_CATEGORIES: []
+        entertainment: ["entertainment", "gamingstrategy"]
+      SINGLE_APPS: ["top1global", "com.facebook.moments"] # 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"]
       SRC_FOLDER: "rapids" # inside src/features/phone_applications_foreground
@@ -197,7 +197,7 @@ PHONE_WIFI_VISIBLE:
   DB_TABLE: "wifi"
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
       SRC_FOLDER: "rapids" # inside src/features/phone_wifi_visible
       SRC_LANGUAGE: "r"
@@ -206,7 +206,7 @@ PHONE_WIFI_CONNECTED:
   DB_TABLE: "sensor_wifi"
   PROVIDERS:
     RAPIDS:
-      COMPUTE: False
+      COMPUTE: True
       FEATURES: ["countscans", "uniquedevices", "countscansmostuniquedevice"]
       SRC_FOLDER: "rapids" # inside src/features/phone_wifi_connected
       SRC_LANGUAGE: "r"