diff --git a/tests/files/proposal_extended_csv_report.csv b/tests/files/proposal_extended_csv_report.csv
index 204b3f3d..7451d3e8 100644
--- a/tests/files/proposal_extended_csv_report.csv
+++ b/tests/files/proposal_extended_csv_report.csv
@@ -1,2 +1,3 @@
-System ID,Public Link,Tag 1 Type,Tag 1 ID,Tag 1 Organization,Hardware ID,Device Type,Device Chassis,Serial Number,Model,Manufacturer,Registered in,Registered (process),Updated in (software),Updated in (web):,Physical state,Trading state,Price,Processor,RAM (MB),Data Storage Size (MB),Processor 1,Processor 1 Manufacturer,Processor 1 Model,Processor 1 Serial Number,Processor 1 Number of cores,Processor 1 Speed (GHz),Processor 2,Processor 2 Manufacturer,Processor 2 Model,Processor 2 Serial Number,RamModule 1,RamModule 1 Manufacturer,RamModule 1 Model,RamModule 1 Serial Number,RamModule 2,RamModule 2 Manufacturer,RamModule 2 Model,RamModule 2 Serial Number,RamModule 3,RamModule 3 Manufacturer,RamModule 3 Model,RamModule 3 Serial Number,RamModule 4,RamModule 4 Manufacturer,RamModule 4 Model,RamModule 4 Serial Number,DataStorage 1,DataStorage 1 Manufacturer,Data Storage 1 Model,Data Storage 1 Serial Number,Erasure Data Storage 1 Serial Number,Erasure Data Storage 1 Size,Erasure Data Storage 1 Software,Erasure Data Storage 1 Result,Erasure Data Storage 1 Type,Erasure Data Storage 1 Method,Erasure Data Storage 1 Elapsed,Erasure Data Storage 1 Date,Erasure Data Storage 1 Steps,Erasure Data Storage 1 Steps Start Time,Erasure Data Storage 1 Steps End Time,DataStorage 2,DataStorage 2 Manufacturer,DataStorage 2 Model,DataStorage 2 Serial Number,Erasure Data Storage 2 Serial Number,Erasure Data Storage 2 Size,Erasure Data Storage 2 Software,Erasure Data Storage 2 Result,Erasure Data Storage 2 Type,Erasure Data Storage 2 Method,Erasure Data Storage 2 Elapsed,Erasure Data Storage 2 Date,Erasure Data Storage 2 Steps,Erasure Data Storage 2 Steps Start Time,Erasure Data Storage 2 Steps End Time,DataStorage 3,DataStorage 3 Manufacturer,DataStorage 3 Model,DataStorage 3 Serial Number,Erasure Data Storage 3 Serial Number,Erasure Data Storage 3 Size,Erasure Data Storage 3 Software,Erasure Data Storage 3 Result,Erasure Data Storage 3 Type,Erasure Data Storage 3 Method,Erasure Data Storage 3 Elapsed,Erasure Data Storage 3 Date,Erasure Data Storage 3 Steps,Erasure Data Storage 3 Steps Start Time,Erasure Data Storage 3 Steps End Time,DataStorage 4,DataStorage 4 Manufacturer,DataStorage 4 Model,DataStorage 4 Serial Number,Erasure Data Storage 4 Serial Number,Erasure Data Storage 4 Size,Erasure Data Storage 4 Software,Erasure Data Storage 4 Result,Erasure Data Storage 4 Type,Erasure Data Storage 4 Method,Erasure Data Storage 4 Elapsed,Erasure Data Storage 4 Date,Erasure Data Storage 4 Steps,Erasure Data Storage 4 Steps Start Time,Erasure Data Storage 4 Steps End Time,Motherboard 1,Motherboard 1 Manufacturer,Motherboard 1 Model,Motherboard 1 Serial Number,Display 1,Display 1 Manufacturer,Display 1 Model,Display 1 Serial Number,GraphicCard 1,GraphicCard 1 Manufacturer,GraphicCard 1 Model,GraphicCard 1 Serial Number,GraphicCard 1 Memory (MB),GraphicCard 2,GraphicCard 2 Manufacturer,GraphicCard 2 Model,GraphicCard 2 Serial Number,NetworkAdapter 1,NetworkAdapter 1 Manufacturer,NetworkAdapter 1 Model,NetworkAdapter 1 Serial Number,NetworkAdapter 2,NetworkAdapter 2 Manufacturer,NetworkAdapter 2 Model,NetworkAdapter 2 Serial Number,SoundCard 1,SoundCard 1 Manufacturer,SoundCard 1 Model,SoundCard 1 Serial Number,SoundCard 2,SoundCard 2 Manufacturer,SoundCard 2 Model,SoundCard 2 Serial Number,Device Rate,Device Range,Processor Rate,Processor Range,RAM Rate,RAM Range,Data Storage Rate,Data Storage Range,Benchmark Processor (points),Benchmark ProcessorSysbench (points),Benchmark RamSysbench (points),Benchmark DataStorage Write Speed (MB/s),Benchmark DataStorage Read Speed (MB/s),Test Data Storage 1 Software,Test Data Storage 1 Type,Test Data Storage 1 Result,Test Data Staorage 1 Power on (hours used),Test Data Storage 1 Lifetime remaining (percentage),Test Stress Software,Test Stress Time (minutes)
-421,api.usody.com/usody/devices/421,unamed,BG3O9,My Organization ,laptop-d1m-d1mr-d1sn,Laptop,Netbook,d1sn,d1m,d1mr,Sat Aug 29 12:18:46 2020,Software,Sat Aug 29 12:18:46 2020,,Ready,,44.10 €,intel atom cpu n450 @ 1.66ghz,8432,512000,"Processor 125: model intel atom cpu n450 @ 1.66ghz, S/N None",,,,1,1.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,"GraphicCard 126: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None",,,,,,,,,,,,,,,,,"SoundCard 127: model nm10/ich7 family high definition audio controller, S/N None",,,,"SoundCard 128: model 1.3m webcam, S/N None",,,,1.47,Low,1.18,Low,1.53,Low,3.3,High,,,,,,Workbench version,,,,,Workbench version,
+System ID;Public Link;Tag 1 Type;Tag 1 ID;Tag 1 Organization;Tag 2 Type;Tag 2 ID;Tag 2 Organization;Tag 3 Type;Tag 3 ID;Tag 3 Organization;Hardware ID;Device Type;Device Chassis;Serial Number;Model;Manufacturer;Registered in;Registered (process);Updated in (software);Updated in (web);Physical state;Trading state;Price;Processor;RAM (MB);Data Storage Size (MB);Processor 1;Processor 1 Manufacturer;Processor 1 Model;Processor 1 Serial Number;Processor 1 Number of cores;Processor 1 Speed (GHz);Benchmark Processor 1 (points);Benchmark ProcessorSysbench Processor 1 (points);Processor 2;Processor 2 Manufacturer;Processor 2 Model;Processor 2 Serial Number;Processor 2 Number of cores;Processor 2 Speed (GHz);Benchmark Processor 2 (points);Benchmark ProcessorSysbench Processor 2 (points);RamModule 1;RamModule 1 Manufacturer;RamModule 1 Model;RamModule 1 Serial Number;RamModule 1 Size (MB);RamModule 1 Speed (MHz);RamModule 2;RamModule 2 Manufacturer;RamModule 2 Model;RamModule 2 Serial Number;RamModule 2 Size (MB);RamModule 2 Speed (MHz);RamModule 3;RamModule 3 Manufacturer;RamModule 3 Model;RamModule 3 Serial Number;RamModule 3 Size (MB);RamModule 3 Speed (MHz);RamModule 4;RamModule 4 Manufacturer;RamModule 4 Model;RamModule 4 Serial Number;RamModule 4 Size (MB);RamModule 4 Speed (MHz);DataStorage 1;DataStorage 1 Manufacturer;DataStorage 1 Model;DataStorage 1 Serial Number;DataStorage 1 Size;Erasure DataStorage 1;Erasure DataStorage 1 Serial Number;Erasure DataStorage 1 Size;Erasure DataStorage 1 Software;Erasure DataStorage 1 Result;Erasure DataStorage 1 Type;Erasure DataStorage 1 Method;Erasure DataStorage 1 Elapsed;Erasure DataStorage 1 Date;Erasure DataStorage 1 Steps;Erasure DataStorage 1 Steps Start Time;Erasure DataStorage 1 Steps End Time;Benchmark DataStorage 1 Read Speed (MB/s);Benchmark DataStorage 1 Writing speed (MB/s);Test DataStorage 1 Software;Test DataStorage 1 Type;Test DataStorage 1 Result;Test DataStorage 1 Power on (hours used);Test DataStorage 1 Lifetime remaining (percentage);DataStorage 2;DataStorage 2 Manufacturer;DataStorage 2 Model;DataStorage 2 Serial Number;DataStorage 2 Size;Erasure DataStorage 2;Erasure DataStorage 2 Serial Number;Erasure DataStorage 2 Size;Erasure DataStorage 2 Software;Erasure DataStorage 2 Result;Erasure DataStorage 2 Type;Erasure DataStorage 2 Method;Erasure DataStorage 2 Elapsed;Erasure DataStorage 2 Date;Erasure DataStorage 2 Steps;Erasure DataStorage 2 Steps Start Time;Erasure DataStorage 2 Steps End Time;Benchmark DataStorage 2 Read Speed (MB/s);Benchmark DataStorage 2 Writing speed (MB/s);Test DataStorage 2 Software;Test DataStorage 2 Type;Test DataStorage 2 Result;Test DataStorage 2 Power on (hours used);Test DataStorage 2 Lifetime remaining (percentage);DataStorage 3;DataStorage 3 Manufacturer;DataStorage 3 Model;DataStorage 3 Serial Number;DataStorage 3 Size;Erasure DataStorage 3;Erasure DataStorage 3 Serial Number;Erasure DataStorage 3 Size;Erasure DataStorage 3 Software;Erasure DataStorage 3 Result;Erasure DataStorage 3 Type;Erasure DataStorage 3 Method;Erasure DataStorage 3 Elapsed;Erasure DataStorage 3 Date;Erasure DataStorage 3 Steps;Erasure DataStorage 3 Steps Start Time;Erasure DataStorage 3 Steps End Time;Benchmark DataStorage 3 Read Speed (MB/s);Benchmark DataStorage 3 Writing speed (MB/s);Test DataStorage 3 Software;Test DataStorage 3 Type;Test DataStorage 3 Result;Test DataStorage 3 Power on (hours used);Test DataStorage 3 Lifetime remaining (percentage);DataStorage 4;DataStorage 4 Manufacturer;DataStorage 4 Model;DataStorage 4 Serial Number;DataStorage 4 Size;Erasure DataStorage 4;Erasure DataStorage 4 Serial Number;Erasure DataStorage 4 Size;Erasure DataStorage 4 Software;Erasure DataStorage 4 Result;Erasure DataStorage 4 Type;Erasure DataStorage 4 Method;Erasure DataStorage 4 Elapsed;Erasure DataStorage 4 Date;Erasure DataStorage 4 Steps;Erasure DataStorage 4 Steps Start Time;Erasure DataStorage 4 Steps End Time;Benchmark DataStorage 4 Read Speed (MB/s);Benchmark DataStorage 4 Writing speed (MB/s);Test DataStorage 4 Software;Test DataStorage 4 Type;Test DataStorage 4 Result;Test DataStorage 4 Power on (hours used);Test DataStorage 4 Lifetime remaining (percentage);Motherboard 1;Motherboard 1 Manufacturer;Motherboard 1 Model;Motherboard 1 Serial Number;Display 1;Display 1 Manufacturer;Display 1 Model;Display 1 Serial Number;GraphicCard 1;GraphicCard 1 Manufacturer;GraphicCard 1 Model;GraphicCard 1 Serial Number;GraphicCard 1 Memory (MB);GraphicCard 2;GraphicCard 2 Manufacturer;GraphicCard 2 Model;GraphicCard 2 Serial Number;GraphicCard 2 Memory (MB);NetworkAdapter 1;NetworkAdapter 1 Manufacturer;NetworkAdapter 1 Model;NetworkAdapter 1 Serial Number;NetworkAdapter 2;NetworkAdapter 2 Manufacturer;NetworkAdapter 2 Model;NetworkAdapter 2 Serial Number;SoundCard 1;SoundCard 1 Manufacturer;SoundCard 1 Model;SoundCard 1 Serial Number;SoundCard 2;SoundCard 2 Manufacturer;SoundCard 2 Model;SoundCard 2 Serial Number;Device Rate;Device Range;Processor Rate;Processor Range;RAM Rate;RAM Range;Data Storage Rate;Data Storage Range;Benchmark RamSysbench (points)
+1;http://localhost/devices/1;unamed;foo;FooOrg;;;;;;;laptop-asustek_computer_inc-1001pxd-b8oaas048285;Laptop;Netbook;b8oaas048285;1001pxd;asustek computer inc.;Wed Oct 21 21:42:27 2020;Workbench 11.0;2020-10-21 21:42:27.370717+02:00;;;;52.50 €;intel atom cpu n455 @ 2.66ghz;1024;238475;Processor 4: model intel atom cpu n455 @ 2.66ghz, S/N None;intel corp.;intel atom cpu n455 @ 2.66ghz;;1;2.667;6666.24;164.0803;;;;;;;;;RamModule 8: model None, S/N None;;;;1024;667;;;;;;;;;;;;;;;;;;;HardDrive 9: model hts54322, S/N e2024242cv86mm;hitachi;hts54322;e2024242cv86mm;238475;harddrive-hitachi-hts54322-e2024242cv86mm;e2024242cv86mm;238475;Workbench 11.0;Success;EraseBasic;Shred;1:16:49;2020-10-21 21:42:27.437814+02:00;✓ – StepRandom 1:16:49;2018-07-03 11:15:22.257059+02:00;2018-07-03 12:32:11.843190+02:00;66.2;21.8;Workbench 11.0;Short;Failure;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;Motherboard 10: model 1001pxd, S/N eee0123456720;asustek computer inc.;1001pxd;eee0123456720;;;;;GraphicCard 5: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None;intel corporation;atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller;;256;;;;;;NetworkAdapter 2: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c9;qualcomm atheros;ar9285 wireless network adapter;74:2f:68:8b:fd:c9;NetworkAdapter 3: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7b;qualcomm atheros;ar8152 v2.0 fast ethernet;14:da:e9:42:f6:7b;SoundCard 6: model nm10/ich7 family high definition audio controller, S/N None;intel corporation;nm10/ich7 family high definition audio controller;;;;;;1.75;LOW;1.55;LOW;1.53;LOW;3.76;HIGH;15.7188
+11;http://localhost/devices/11;;;;;;;;;;laptop-asustek_computer_inc-1001pxd-b8oaas048287;Laptop;Netbook;b8oaas048287;1001pxd;asustek computer inc.;Wed Oct 21 21:42:27 2020;Workbench 11.0;2020-10-21 21:42:27.616567+02:00;;;;51.60 €;intel atom cpu n455 @ 1.66ghz;2048;558558;Processor 15: model intel atom cpu n455 @ 1.66ghz, S/N None;intel corp.;intel atom cpu n455 @ 1.66ghz;;1;1.667;6666.24;164.0803;;;;;;;;;RamModule 18: model None, S/N None;;;;1024;667;RamModule 19: model 48594d503131325336344350362d53362020, S/N 4f43487b;hynix semiconductor;48594d503131325336344350362d53362020;4f43487b;1024;667;;;;;;;;;;;;;HardDrive 20: model hts54322, S/N e2024242cv86hj;hitachi;hts54322;e2024242cv86hj;238475;harddrive-hitachi-hts54322-e2024242cv86hj;e2024242cv86hj;238475;Workbench 11.0;Success;EraseBasic;Shred;1:16:49;2020-10-21 21:42:27.629235+02:00;✓ – StepRandom 1:16:49;2018-07-03 11:15:22.257059+02:00;2018-07-03 12:32:11.843190+02:00;66.2;21.8;Workbench 11.0;Extended;Failure;;;DataStorage 21: model wdc wd1600bevt-2, S/N wd-wx11a80w7430;western digital;wdc wd1600bevt-2;wd-wx11a80w7430;160041;datastorage-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430;wd-wx11a80w7430;160041;Workbench 11.0;Failure;EraseBasic;Shred;0:45:36;2020-10-21 21:42:27.630901+02:00;✓ – StepRandom 0:45:36;2019-10-23 09:49:54.410830+02:00;2019-10-23 10:35:31.400587+02:00;41.6;17.3;Workbench 11.0;Short;Success;5293;195 days, 12:00:00;SolidStateDrive 22: model wdc wd1600bevt-2, S/N wd-wx11a80w7430;western digital;wdc wd1600bevt-2;wd-wx11a80w7430;160042;solidstatedrive-western_digital-wdc_wd1600bevt-2-wd-wx11a80w7430;wd-wx11a80w7430;160042;Workbench 11.0;Success;EraseSectors;Badblocks;0:46:03;2020-10-21 21:42:27.633584+02:00;✓ – StepRandom 0:46:03;2019-08-19 18:48:19.690458+02:00;2019-08-19 19:34:22.930562+02:00;41.1;17.1;Workbench 11.0;Short;Success;5231;194 days, 17:00:00;;;;;;;;;;;;;;;;;;;;;;;;;Motherboard 23: model 1001pxd, S/N eee0123456789;asustek computer inc.;1001pxd;eee0123456789;;auo "auo";auo lcd monitor;;GraphicCard 16: model atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller, S/N None;intel corporation;atom processor d4xx/d5xx/n4xx/n5xx integrated graphics controller;;256;;;;;;NetworkAdapter 13: model ar9285 wireless network adapter, S/N 74:2f:68:8b:fd:c8;qualcomm atheros;ar9285 wireless network adapter;74:2f:68:8b:fd:c8;NetworkAdapter 14: model ar8152 v2.0 fast ethernet, S/N 14:da:e9:42:f6:7c;qualcomm atheros;ar8152 v2.0 fast ethernet;14:da:e9:42:f6:7c;SoundCard 7: model usb 2.0 uvc vga webcam, S/N 0x0001;azurewave;usb 2.0 uvc vga webcam;0x0001;SoundCard 17: model nm10/ich7 family high definition audio controller, S/N None;intel corporation;nm10/ich7 family high definition audio controller;;1.72;LOW;1.31;LOW;1.99;LOW;3.97;HIGH;15.7188
\ No newline at end of file
diff --git a/tests/files/real-eee-1001pxd.snapshot.12.yaml b/tests/files/real-eee-1001pxd.snapshot.12.yaml
index a807c7f0..6dc974bd 100644
--- a/tests/files/real-eee-1001pxd.snapshot.12.yaml
+++ b/tests/files/real-eee-1001pxd.snapshot.12.yaml
@@ -3,7 +3,7 @@
   {
     "type": "NetworkAdapter",
     "model": "AR9285 Wireless Network Adapter",
-    "serialNumber": "74:2f:68:8b:fd:c8",
+    "serialNumber": "74:2f:68:8b:fd:c9",
     "manufacturer": "Qualcomm Atheros",
     "wireless": true,
     "actions": []
@@ -11,7 +11,7 @@
   {
     "type": "NetworkAdapter",
     "model": "AR8152 v2.0 Fast Ethernet",
-    "serialNumber": "14:da:e9:42:f6:7c",
+    "serialNumber": "14:da:e9:42:f6:7b",
     "manufacturer": "Qualcomm Atheros",
     "speed": 100,
     "wireless": false,
@@ -22,10 +22,10 @@
     "cores": 1,
     "threads": 1,
     "address": 64,
-    "model": "Intel Atom CPU N455 @ 1.66GHz",
+    "model": "Intel Atom CPU N455 @ 2.66GHz",
     "serialNumber": null,
     "manufacturer": "Intel Corp.",
-    "speed": 1.667,
+    "speed": 2.667,
     "actions": [
     {
       "type": "BenchmarkProcessorSysbench",
@@ -77,7 +77,7 @@
     "model": "HTS54322",
     "size": 238475,
     "interface": "ATA",
-    "serialNumber": "E2024242CV86HJ",
+    "serialNumber": "E2024242CV86MM",
     "manufacturer": "Hitachi",
     "actions": [
     {
@@ -117,7 +117,7 @@
     "model": "1001PXD",
     "slots": 2,
     "pcmcia": 0,
-    "serialNumber": "Eee0123456789",
+    "serialNumber": "Eee0123456720",
     "usb": 5,
     "manufacturer": "ASUSTeK Computer INC.",
     "actions": [
@@ -137,7 +137,7 @@
   "device": {
     "type": "Laptop",
     "model": "1001PXD",
-    "serialNumber": "B8OAAS048286",
+    "serialNumber": "B8OAAS048285",
     "manufacturer": "ASUSTeK Computer INC.",
     "chassis": "Netbook",
     "actions": [