diff --git a/pycqed/tests/test_data/20161214/120000_dummy_Butterfly/120000_dummy_Butterfly.hdf5 b/pycqed/tests/test_data/20161214/120000_dummy_Butterfly/120000_dummy_Butterfly.hdf5
index beeab35028..db8f6f10d0 100644
Binary files a/pycqed/tests/test_data/20161214/120000_dummy_Butterfly/120000_dummy_Butterfly.hdf5 and b/pycqed/tests/test_data/20161214/120000_dummy_Butterfly/120000_dummy_Butterfly.hdf5 differ
diff --git a/pycqed/tests/test_data/20170120/001151_Dummy_Tomo_31_QL_QR_/001151_Dummy_Tomo_31_QL_QR_.hdf5 b/pycqed/tests/test_data/20170120/001151_Dummy_Tomo_31_QL_QR_/001151_Dummy_Tomo_31_QL_QR_.hdf5
index e655e0ec5a..a8c382a0bb 100755
Binary files a/pycqed/tests/test_data/20170120/001151_Dummy_Tomo_31_QL_QR_/001151_Dummy_Tomo_31_QL_QR_.hdf5 and b/pycqed/tests/test_data/20170120/001151_Dummy_Tomo_31_QL_QR_/001151_Dummy_Tomo_31_QL_QR_.hdf5 differ
diff --git a/pycqed/tests/test_data/20170201/122018_Ramsey_AncT/122018_Ramsey_AncT.hdf5 b/pycqed/tests/test_data/20170201/122018_Ramsey_AncT/122018_Ramsey_AncT.hdf5
index 10280457c6..8d208a98d4 100644
Binary files a/pycqed/tests/test_data/20170201/122018_Ramsey_AncT/122018_Ramsey_AncT.hdf5 and b/pycqed/tests/test_data/20170201/122018_Ramsey_AncT/122018_Ramsey_AncT.hdf5 differ
diff --git a/pycqed/tests/test_data/20170227/115026_resonator_scan_qubit/115026_resonator_scan_qubit.hdf5 b/pycqed/tests/test_data/20170227/115026_resonator_scan_qubit/115026_resonator_scan_qubit.hdf5
index 9b904cab35..da7334ff74 100644
Binary files a/pycqed/tests/test_data/20170227/115026_resonator_scan_qubit/115026_resonator_scan_qubit.hdf5 and b/pycqed/tests/test_data/20170227/115026_resonator_scan_qubit/115026_resonator_scan_qubit.hdf5 differ
diff --git a/pycqed/tests/test_data/20170227/115118_acquisition_delay_scan_qubit/115118_acquisition_delay_scan_qubit.hdf5 b/pycqed/tests/test_data/20170227/115118_acquisition_delay_scan_qubit/115118_acquisition_delay_scan_qubit.hdf5
index e47404c538..689ba7bdc3 100644
Binary files a/pycqed/tests/test_data/20170227/115118_acquisition_delay_scan_qubit/115118_acquisition_delay_scan_qubit.hdf5 and b/pycqed/tests/test_data/20170227/115118_acquisition_delay_scan_qubit/115118_acquisition_delay_scan_qubit.hdf5 differ
diff --git a/pycqed/tests/test_data/20170412/183928_Rabi-n1_q9/183928_Rabi-n1_q9.hdf5 b/pycqed/tests/test_data/20170412/183928_Rabi-n1_q9/183928_Rabi-n1_q9.hdf5
index 79943d6277..0923d477e1 100644
Binary files a/pycqed/tests/test_data/20170412/183928_Rabi-n1_q9/183928_Rabi-n1_q9.hdf5 and b/pycqed/tests/test_data/20170412/183928_Rabi-n1_q9/183928_Rabi-n1_q9.hdf5 differ
diff --git a/pycqed/tests/test_data/20170412/185618_Rabi-n1_q9/185618_Rabi-n1_q9.hdf5 b/pycqed/tests/test_data/20170412/185618_Rabi-n1_q9/185618_Rabi-n1_q9.hdf5
index ced751d941..0bb816f931 100644
Binary files a/pycqed/tests/test_data/20170412/185618_Rabi-n1_q9/185618_Rabi-n1_q9.hdf5 and b/pycqed/tests/test_data/20170412/185618_Rabi-n1_q9/185618_Rabi-n1_q9.hdf5 differ
diff --git a/pycqed/tests/test_data/20170413/134244_Rabi-n1_q9/134244_Rabi-n1_q9.hdf5 b/pycqed/tests/test_data/20170413/134244_Rabi-n1_q9/134244_Rabi-n1_q9.hdf5
index 11b986eddb..f061b97d04 100644
Binary files a/pycqed/tests/test_data/20170413/134244_Rabi-n1_q9/134244_Rabi-n1_q9.hdf5 and b/pycqed/tests/test_data/20170413/134244_Rabi-n1_q9/134244_Rabi-n1_q9.hdf5 differ
diff --git a/pycqed/tests/test_data/20170606/162250_SSRO_QL_QR/162250_SSRO_QL_QR.hdf5 b/pycqed/tests/test_data/20170606/162250_SSRO_QL_QR/162250_SSRO_QL_QR.hdf5
index f69fc32a7d..54cd0a8a83 100644
Binary files a/pycqed/tests/test_data/20170606/162250_SSRO_QL_QR/162250_SSRO_QL_QR.hdf5 and b/pycqed/tests/test_data/20170606/162250_SSRO_QL_QR/162250_SSRO_QL_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/145645_Ramsey_10pulse_sep_QR/145645_Ramsey_10pulse_sep_QR.hdf5 b/pycqed/tests/test_data/20170607/145645_Ramsey_10pulse_sep_QR/145645_Ramsey_10pulse_sep_QR.hdf5
index 6aa617efa4..a868a5a18a 100644
Binary files a/pycqed/tests/test_data/20170607/145645_Ramsey_10pulse_sep_QR/145645_Ramsey_10pulse_sep_QR.hdf5 and b/pycqed/tests/test_data/20170607/145645_Ramsey_10pulse_sep_QR/145645_Ramsey_10pulse_sep_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/152324_T1_QL/152324_T1_QL.hdf5 b/pycqed/tests/test_data/20170607/152324_T1_QL/152324_T1_QL.hdf5
index 1f1f872f43..3cb28b4adf 100644
Binary files a/pycqed/tests/test_data/20170607/152324_T1_QL/152324_T1_QL.hdf5 and b/pycqed/tests/test_data/20170607/152324_T1_QL/152324_T1_QL.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/160504_Rabi-n1_QR/160504_Rabi-n1_QR.hdf5 b/pycqed/tests/test_data/20170607/160504_Rabi-n1_QR/160504_Rabi-n1_QR.hdf5
index fe38b7c9b2..cd17ecec55 100644
Binary files a/pycqed/tests/test_data/20170607/160504_Rabi-n1_QR/160504_Rabi-n1_QR.hdf5 and b/pycqed/tests/test_data/20170607/160504_Rabi-n1_QR/160504_Rabi-n1_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/161234_Motzoi_XY_QR/161234_Motzoi_XY_QR.hdf5 b/pycqed/tests/test_data/20170607/161234_Motzoi_XY_QR/161234_Motzoi_XY_QR.hdf5
index 69d613b307..0651e13aea 100644
Binary files a/pycqed/tests/test_data/20170607/161234_Motzoi_XY_QR/161234_Motzoi_XY_QR.hdf5 and b/pycqed/tests/test_data/20170607/161234_Motzoi_XY_QR/161234_Motzoi_XY_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/161456_AllXY_QR/161456_AllXY_QR.hdf5 b/pycqed/tests/test_data/20170607/161456_AllXY_QR/161456_AllXY_QR.hdf5
index e44757d63c..8f67067f30 100644
Binary files a/pycqed/tests/test_data/20170607/161456_AllXY_QR/161456_AllXY_QR.hdf5 and b/pycqed/tests/test_data/20170607/161456_AllXY_QR/161456_AllXY_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/210555_Motzoi_XY_QR/210555_Motzoi_XY_QR.hdf5 b/pycqed/tests/test_data/20170607/210555_Motzoi_XY_QR/210555_Motzoi_XY_QR.hdf5
index c35a013ceb..e7a40cdb29 100644
Binary files a/pycqed/tests/test_data/20170607/210555_Motzoi_XY_QR/210555_Motzoi_XY_QR.hdf5 and b/pycqed/tests/test_data/20170607/210555_Motzoi_XY_QR/210555_Motzoi_XY_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/210655_RB_100seeds_QR/210655_RB_100seeds_QR.hdf5 b/pycqed/tests/test_data/20170607/210655_RB_100seeds_QR/210655_RB_100seeds_QR.hdf5
index 54fc6734ac..f58a11edc9 100644
Binary files a/pycqed/tests/test_data/20170607/210655_RB_100seeds_QR/210655_RB_100seeds_QR.hdf5 and b/pycqed/tests/test_data/20170607/210655_RB_100seeds_QR/210655_RB_100seeds_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/211144_Ramsey_QR/211144_Ramsey_QR.hdf5 b/pycqed/tests/test_data/20170607/211144_Ramsey_QR/211144_Ramsey_QR.hdf5
index 00488ca91a..1fa568148e 100644
Binary files a/pycqed/tests/test_data/20170607/211144_Ramsey_QR/211144_Ramsey_QR.hdf5 and b/pycqed/tests/test_data/20170607/211144_Ramsey_QR/211144_Ramsey_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/211203_Rabi-n1_QR/211203_Rabi-n1_QR.hdf5 b/pycqed/tests/test_data/20170607/211203_Rabi-n1_QR/211203_Rabi-n1_QR.hdf5
index d3a365ee50..b78b636f4b 100644
Binary files a/pycqed/tests/test_data/20170607/211203_Rabi-n1_QR/211203_Rabi-n1_QR.hdf5 and b/pycqed/tests/test_data/20170607/211203_Rabi-n1_QR/211203_Rabi-n1_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/211611_echo_QR/211611_echo_QR.hdf5 b/pycqed/tests/test_data/20170607/211611_echo_QR/211611_echo_QR.hdf5
index b941d17a09..73a0a87ad4 100644
Binary files a/pycqed/tests/test_data/20170607/211611_echo_QR/211611_echo_QR.hdf5 and b/pycqed/tests/test_data/20170607/211611_echo_QR/211611_echo_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170607/211630_AllXY_QR/211630_AllXY_QR.hdf5 b/pycqed/tests/test_data/20170607/211630_AllXY_QR/211630_AllXY_QR.hdf5
index 83da4b2a03..693bd8407f 100644
Binary files a/pycqed/tests/test_data/20170607/211630_AllXY_QR/211630_AllXY_QR.hdf5 and b/pycqed/tests/test_data/20170607/211630_AllXY_QR/211630_AllXY_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170716/134634_SSRO_QR/134634_SSRO_QR.hdf5 b/pycqed/tests/test_data/20170716/134634_SSRO_QR/134634_SSRO_QR.hdf5
index 22a3223450..556fce43fe 100644
Binary files a/pycqed/tests/test_data/20170716/134634_SSRO_QR/134634_SSRO_QR.hdf5 and b/pycqed/tests/test_data/20170716/134634_SSRO_QR/134634_SSRO_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170716/144742_Butterfly_QR_initialize_True/144742_Butterfly_QR_initialize_True.hdf5 b/pycqed/tests/test_data/20170716/144742_Butterfly_QR_initialize_True/144742_Butterfly_QR_initialize_True.hdf5
index 9204a97a10..4a1a7d8349 100644
Binary files a/pycqed/tests/test_data/20170716/144742_Butterfly_QR_initialize_True/144742_Butterfly_QR_initialize_True.hdf5 and b/pycqed/tests/test_data/20170716/144742_Butterfly_QR_initialize_True/144742_Butterfly_QR_initialize_True.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164507_flipping_sequence_rancoarse_fact0.80_QR/164507_flipping_sequence_rancoarse_fact0.80_QR.hdf5 b/pycqed/tests/test_data/20170726/164507_flipping_sequence_rancoarse_fact0.80_QR/164507_flipping_sequence_rancoarse_fact0.80_QR.hdf5
index 7bb211c21c..870733b13c 100644
Binary files a/pycqed/tests/test_data/20170726/164507_flipping_sequence_rancoarse_fact0.80_QR/164507_flipping_sequence_rancoarse_fact0.80_QR.hdf5 and b/pycqed/tests/test_data/20170726/164507_flipping_sequence_rancoarse_fact0.80_QR/164507_flipping_sequence_rancoarse_fact0.80_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164536_flipping_sequence_rancoarse_fact0.90_QR/164536_flipping_sequence_rancoarse_fact0.90_QR.hdf5 b/pycqed/tests/test_data/20170726/164536_flipping_sequence_rancoarse_fact0.90_QR/164536_flipping_sequence_rancoarse_fact0.90_QR.hdf5
index 24833cca6b..e0b7cca8b1 100644
Binary files a/pycqed/tests/test_data/20170726/164536_flipping_sequence_rancoarse_fact0.90_QR/164536_flipping_sequence_rancoarse_fact0.90_QR.hdf5 and b/pycqed/tests/test_data/20170726/164536_flipping_sequence_rancoarse_fact0.90_QR/164536_flipping_sequence_rancoarse_fact0.90_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164550_flipping_sequence_ranfine_fact0.90_QR/164550_flipping_sequence_ranfine_fact0.90_QR.hdf5 b/pycqed/tests/test_data/20170726/164550_flipping_sequence_ranfine_fact0.90_QR/164550_flipping_sequence_ranfine_fact0.90_QR.hdf5
index fffa063b26..6f085e98b9 100644
Binary files a/pycqed/tests/test_data/20170726/164550_flipping_sequence_ranfine_fact0.90_QR/164550_flipping_sequence_ranfine_fact0.90_QR.hdf5 and b/pycqed/tests/test_data/20170726/164550_flipping_sequence_ranfine_fact0.90_QR/164550_flipping_sequence_ranfine_fact0.90_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164605_flipping_sequence_rancoarse_fact0.95_QR/164605_flipping_sequence_rancoarse_fact0.95_QR.hdf5 b/pycqed/tests/test_data/20170726/164605_flipping_sequence_rancoarse_fact0.95_QR/164605_flipping_sequence_rancoarse_fact0.95_QR.hdf5
index 5f7a3096c2..6c4572a139 100644
Binary files a/pycqed/tests/test_data/20170726/164605_flipping_sequence_rancoarse_fact0.95_QR/164605_flipping_sequence_rancoarse_fact0.95_QR.hdf5 and b/pycqed/tests/test_data/20170726/164605_flipping_sequence_rancoarse_fact0.95_QR/164605_flipping_sequence_rancoarse_fact0.95_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164619_flipping_sequence_ranfine_fact0.95_QR/164619_flipping_sequence_ranfine_fact0.95_QR.hdf5 b/pycqed/tests/test_data/20170726/164619_flipping_sequence_ranfine_fact0.95_QR/164619_flipping_sequence_ranfine_fact0.95_QR.hdf5
index 1e34e4f6d5..e4ceb46f6f 100644
Binary files a/pycqed/tests/test_data/20170726/164619_flipping_sequence_ranfine_fact0.95_QR/164619_flipping_sequence_ranfine_fact0.95_QR.hdf5 and b/pycqed/tests/test_data/20170726/164619_flipping_sequence_ranfine_fact0.95_QR/164619_flipping_sequence_ranfine_fact0.95_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164635_flipping_sequence_rancoarse_fact0.99_QR/164635_flipping_sequence_rancoarse_fact0.99_QR.hdf5 b/pycqed/tests/test_data/20170726/164635_flipping_sequence_rancoarse_fact0.99_QR/164635_flipping_sequence_rancoarse_fact0.99_QR.hdf5
index a5b409f741..b25f7c3fc7 100644
Binary files a/pycqed/tests/test_data/20170726/164635_flipping_sequence_rancoarse_fact0.99_QR/164635_flipping_sequence_rancoarse_fact0.99_QR.hdf5 and b/pycqed/tests/test_data/20170726/164635_flipping_sequence_rancoarse_fact0.99_QR/164635_flipping_sequence_rancoarse_fact0.99_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164649_flipping_sequence_ranfine_fact0.99_QR/164649_flipping_sequence_ranfine_fact0.99_QR.hdf5 b/pycqed/tests/test_data/20170726/164649_flipping_sequence_ranfine_fact0.99_QR/164649_flipping_sequence_ranfine_fact0.99_QR.hdf5
index a41abcac42..68caf4a1aa 100644
Binary files a/pycqed/tests/test_data/20170726/164649_flipping_sequence_ranfine_fact0.99_QR/164649_flipping_sequence_ranfine_fact0.99_QR.hdf5 and b/pycqed/tests/test_data/20170726/164649_flipping_sequence_ranfine_fact0.99_QR/164649_flipping_sequence_ranfine_fact0.99_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164704_flipping_sequence_rancoarse_fact1.00_QR/164704_flipping_sequence_rancoarse_fact1.00_QR.hdf5 b/pycqed/tests/test_data/20170726/164704_flipping_sequence_rancoarse_fact1.00_QR/164704_flipping_sequence_rancoarse_fact1.00_QR.hdf5
index c1a4db2b15..e9edd844a1 100644
Binary files a/pycqed/tests/test_data/20170726/164704_flipping_sequence_rancoarse_fact1.00_QR/164704_flipping_sequence_rancoarse_fact1.00_QR.hdf5 and b/pycqed/tests/test_data/20170726/164704_flipping_sequence_rancoarse_fact1.00_QR/164704_flipping_sequence_rancoarse_fact1.00_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164718_flipping_sequence_ranfine_fact1.00_QR/164718_flipping_sequence_ranfine_fact1.00_QR.hdf5 b/pycqed/tests/test_data/20170726/164718_flipping_sequence_ranfine_fact1.00_QR/164718_flipping_sequence_ranfine_fact1.00_QR.hdf5
index d01cf307f0..3f5d8ec999 100644
Binary files a/pycqed/tests/test_data/20170726/164718_flipping_sequence_ranfine_fact1.00_QR/164718_flipping_sequence_ranfine_fact1.00_QR.hdf5 and b/pycqed/tests/test_data/20170726/164718_flipping_sequence_ranfine_fact1.00_QR/164718_flipping_sequence_ranfine_fact1.00_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164733_flipping_sequence_rancoarse_fact1.01_QR/164733_flipping_sequence_rancoarse_fact1.01_QR.hdf5 b/pycqed/tests/test_data/20170726/164733_flipping_sequence_rancoarse_fact1.01_QR/164733_flipping_sequence_rancoarse_fact1.01_QR.hdf5
index a41c4fde52..0c9c3201c5 100644
Binary files a/pycqed/tests/test_data/20170726/164733_flipping_sequence_rancoarse_fact1.01_QR/164733_flipping_sequence_rancoarse_fact1.01_QR.hdf5 and b/pycqed/tests/test_data/20170726/164733_flipping_sequence_rancoarse_fact1.01_QR/164733_flipping_sequence_rancoarse_fact1.01_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164747_flipping_sequence_ranfine_fact1.01_QR/164747_flipping_sequence_ranfine_fact1.01_QR.hdf5 b/pycqed/tests/test_data/20170726/164747_flipping_sequence_ranfine_fact1.01_QR/164747_flipping_sequence_ranfine_fact1.01_QR.hdf5
index 313981219d..aa17c0168b 100644
Binary files a/pycqed/tests/test_data/20170726/164747_flipping_sequence_ranfine_fact1.01_QR/164747_flipping_sequence_ranfine_fact1.01_QR.hdf5 and b/pycqed/tests/test_data/20170726/164747_flipping_sequence_ranfine_fact1.01_QR/164747_flipping_sequence_ranfine_fact1.01_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164802_flipping_sequence_rancoarse_fact1.05_QR/164802_flipping_sequence_rancoarse_fact1.05_QR.hdf5 b/pycqed/tests/test_data/20170726/164802_flipping_sequence_rancoarse_fact1.05_QR/164802_flipping_sequence_rancoarse_fact1.05_QR.hdf5
index 27efc349fe..a0f3d01221 100644
Binary files a/pycqed/tests/test_data/20170726/164802_flipping_sequence_rancoarse_fact1.05_QR/164802_flipping_sequence_rancoarse_fact1.05_QR.hdf5 and b/pycqed/tests/test_data/20170726/164802_flipping_sequence_rancoarse_fact1.05_QR/164802_flipping_sequence_rancoarse_fact1.05_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164816_flipping_sequence_ranfine_fact1.05_QR/164816_flipping_sequence_ranfine_fact1.05_QR.hdf5 b/pycqed/tests/test_data/20170726/164816_flipping_sequence_ranfine_fact1.05_QR/164816_flipping_sequence_ranfine_fact1.05_QR.hdf5
index 83a7c7e35a..e4813ff806 100644
Binary files a/pycqed/tests/test_data/20170726/164816_flipping_sequence_ranfine_fact1.05_QR/164816_flipping_sequence_ranfine_fact1.05_QR.hdf5 and b/pycqed/tests/test_data/20170726/164816_flipping_sequence_ranfine_fact1.05_QR/164816_flipping_sequence_ranfine_fact1.05_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164831_flipping_sequence_rancoarse_fact1.10_QR/164831_flipping_sequence_rancoarse_fact1.10_QR.hdf5 b/pycqed/tests/test_data/20170726/164831_flipping_sequence_rancoarse_fact1.10_QR/164831_flipping_sequence_rancoarse_fact1.10_QR.hdf5
index ab4ca25570..ff24bcfdcc 100644
Binary files a/pycqed/tests/test_data/20170726/164831_flipping_sequence_rancoarse_fact1.10_QR/164831_flipping_sequence_rancoarse_fact1.10_QR.hdf5 and b/pycqed/tests/test_data/20170726/164831_flipping_sequence_rancoarse_fact1.10_QR/164831_flipping_sequence_rancoarse_fact1.10_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164845_flipping_sequence_ranfine_fact1.10_QR/164845_flipping_sequence_ranfine_fact1.10_QR.hdf5 b/pycqed/tests/test_data/20170726/164845_flipping_sequence_ranfine_fact1.10_QR/164845_flipping_sequence_ranfine_fact1.10_QR.hdf5
index 3ec3c51691..d14ba25896 100644
Binary files a/pycqed/tests/test_data/20170726/164845_flipping_sequence_ranfine_fact1.10_QR/164845_flipping_sequence_ranfine_fact1.10_QR.hdf5 and b/pycqed/tests/test_data/20170726/164845_flipping_sequence_ranfine_fact1.10_QR/164845_flipping_sequence_ranfine_fact1.10_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170726/164901_flipping_sequence_rancoarse_fact1.20_QR/164901_flipping_sequence_rancoarse_fact1.20_QR.hdf5 b/pycqed/tests/test_data/20170726/164901_flipping_sequence_rancoarse_fact1.20_QR/164901_flipping_sequence_rancoarse_fact1.20_QR.hdf5
index 3ef2061551..9cce78ff00 100644
Binary files a/pycqed/tests/test_data/20170726/164901_flipping_sequence_rancoarse_fact1.20_QR/164901_flipping_sequence_rancoarse_fact1.20_QR.hdf5 and b/pycqed/tests/test_data/20170726/164901_flipping_sequence_rancoarse_fact1.20_QR/164901_flipping_sequence_rancoarse_fact1.20_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/120456_resonator_spec_qubit/120456_resonator_spec_qubit.hdf5 b/pycqed/tests/test_data/20170929/120456_resonator_spec_qubit/120456_resonator_spec_qubit.hdf5
index 138b8bcd24..0df0811f8a 100644
Binary files a/pycqed/tests/test_data/20170929/120456_resonator_spec_qubit/120456_resonator_spec_qubit.hdf5 and b/pycqed/tests/test_data/20170929/120456_resonator_spec_qubit/120456_resonator_spec_qubit.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/144754_spectroscopy_qb2/144754_spectroscopy_qb2.hdf5 b/pycqed/tests/test_data/20170929/144754_spectroscopy_qb2/144754_spectroscopy_qb2.hdf5
index 920fbae2de..06268e7747 100644
Binary files a/pycqed/tests/test_data/20170929/144754_spectroscopy_qb2/144754_spectroscopy_qb2.hdf5 and b/pycqed/tests/test_data/20170929/144754_spectroscopy_qb2/144754_spectroscopy_qb2.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/165005_QScale_qb6/165005_QScale_qb6.hdf5 b/pycqed/tests/test_data/20170929/165005_QScale_qb6/165005_QScale_qb6.hdf5
index dc3617fbe5..344eccc531 100644
Binary files a/pycqed/tests/test_data/20170929/165005_QScale_qb6/165005_QScale_qb6.hdf5 and b/pycqed/tests/test_data/20170929/165005_QScale_qb6/165005_QScale_qb6.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/174145_resonator_spec_qubit/174145_resonator_spec_qubit.hdf5 b/pycqed/tests/test_data/20170929/174145_resonator_spec_qubit/174145_resonator_spec_qubit.hdf5
index dd4d17f862..54fdc22ddb 100644
Binary files a/pycqed/tests/test_data/20170929/174145_resonator_spec_qubit/174145_resonator_spec_qubit.hdf5 and b/pycqed/tests/test_data/20170929/174145_resonator_spec_qubit/174145_resonator_spec_qubit.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/175516_spectroscopy_qb2/175516_spectroscopy_qb2.hdf5 b/pycqed/tests/test_data/20170929/175516_spectroscopy_qb2/175516_spectroscopy_qb2.hdf5
index 7ddf1a33dd..dccf030513 100644
Binary files a/pycqed/tests/test_data/20170929/175516_spectroscopy_qb2/175516_spectroscopy_qb2.hdf5 and b/pycqed/tests/test_data/20170929/175516_spectroscopy_qb2/175516_spectroscopy_qb2.hdf5 differ
diff --git a/pycqed/tests/test_data/20170929/205730_QScale_qb6/205730_QScale_qb6.hdf5 b/pycqed/tests/test_data/20170929/205730_QScale_qb6/205730_QScale_qb6.hdf5
index d12c6dc099..94ad5e7ca2 100644
Binary files a/pycqed/tests/test_data/20170929/205730_QScale_qb6/205730_QScale_qb6.hdf5 and b/pycqed/tests/test_data/20170929/205730_QScale_qb6/205730_QScale_qb6.hdf5 differ
diff --git a/pycqed/tests/test_data/20171012/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 b/pycqed/tests/test_data/20171012/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5
index 2a68497f98..5a6852ad34 100755
Binary files a/pycqed/tests/test_data/20171012/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 and b/pycqed/tests/test_data/20171012/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/213543_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 differ
diff --git a/pycqed/tests/test_data/20171012/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 b/pycqed/tests/test_data/20171012/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5
index 2b70028a22..cb57ac156f 100755
Binary files a/pycqed/tests/test_data/20171012/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 and b/pycqed/tests/test_data/20171012/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214325_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 differ
diff --git a/pycqed/tests/test_data/20171012/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 b/pycqed/tests/test_data/20171012/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5
index 9633b1c21c..8fa02a9326 100755
Binary files a/pycqed/tests/test_data/20171012/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 and b/pycqed/tests/test_data/20171012/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down/214657_Measure_RTE_ro_duration_1500_sequence_echo_pulse_type_up_down_down.hdf5 differ
diff --git a/pycqed/tests/test_data/20171016/135112_Measure_SSRO_QL/135112_Measure_SSRO_QL.hdf5 b/pycqed/tests/test_data/20171016/135112_Measure_SSRO_QL/135112_Measure_SSRO_QL.hdf5
index 19fc0d8825..c5b948270a 100644
Binary files a/pycqed/tests/test_data/20171016/135112_Measure_SSRO_QL/135112_Measure_SSRO_QL.hdf5 and b/pycqed/tests/test_data/20171016/135112_Measure_SSRO_QL/135112_Measure_SSRO_QL.hdf5 differ
diff --git a/pycqed/tests/test_data/20171016/171715_Measure_SSRO_QL/171715_Measure_SSRO_QL.hdf5 b/pycqed/tests/test_data/20171016/171715_Measure_SSRO_QL/171715_Measure_SSRO_QL.hdf5
index 0f29a6b8df..aa57c60bb2 100644
Binary files a/pycqed/tests/test_data/20171016/171715_Measure_SSRO_QL/171715_Measure_SSRO_QL.hdf5 and b/pycqed/tests/test_data/20171016/171715_Measure_SSRO_QL/171715_Measure_SSRO_QL.hdf5 differ
diff --git a/pycqed/tests/test_data/20171016/181021_Measure_SSRO_QL/181021_Measure_SSRO_QL.hdf5 b/pycqed/tests/test_data/20171016/181021_Measure_SSRO_QL/181021_Measure_SSRO_QL.hdf5
index cf5bd53dc5..4e2d46a510 100644
Binary files a/pycqed/tests/test_data/20171016/181021_Measure_SSRO_QL/181021_Measure_SSRO_QL.hdf5 and b/pycqed/tests/test_data/20171016/181021_Measure_SSRO_QL/181021_Measure_SSRO_QL.hdf5 differ
diff --git a/pycqed/tests/test_data/20171126/180251_QR_phase/180251_QR_phase.hdf5 b/pycqed/tests/test_data/20171126/180251_QR_phase/180251_QR_phase.hdf5
index e23a50f294..fd08a339ff 100644
Binary files a/pycqed/tests/test_data/20171126/180251_QR_phase/180251_QR_phase.hdf5 and b/pycqed/tests/test_data/20171126/180251_QR_phase/180251_QR_phase.hdf5 differ
diff --git a/pycqed/tests/test_data/20171126/181327_QL_phase/181327_QL_phase.hdf5 b/pycqed/tests/test_data/20171126/181327_QL_phase/181327_QL_phase.hdf5
index 25e7efc96d..8478f29294 100644
Binary files a/pycqed/tests/test_data/20171126/181327_QL_phase/181327_QL_phase.hdf5 and b/pycqed/tests/test_data/20171126/181327_QL_phase/181327_QL_phase.hdf5 differ
diff --git a/pycqed/tests/test_data/20180130/191229_conditional_oscillation_device/191229_conditional_oscillation_device.hdf5 b/pycqed/tests/test_data/20180130/191229_conditional_oscillation_device/191229_conditional_oscillation_device.hdf5
index a2810df47f..a5a9aaec7e 100644
Binary files a/pycqed/tests/test_data/20180130/191229_conditional_oscillation_device/191229_conditional_oscillation_device.hdf5 and b/pycqed/tests/test_data/20180130/191229_conditional_oscillation_device/191229_conditional_oscillation_device.hdf5 differ
diff --git a/pycqed/tests/test_data/20180210/181633_idle_error_rates_QL/181633_idle_error_rates_QL.hdf5 b/pycqed/tests/test_data/20180210/181633_idle_error_rates_QL/181633_idle_error_rates_QL.hdf5
index 4d71f0c2df..c2f5dbff05 100644
Binary files a/pycqed/tests/test_data/20180210/181633_idle_error_rates_QL/181633_idle_error_rates_QL.hdf5 and b/pycqed/tests/test_data/20180210/181633_idle_error_rates_QL/181633_idle_error_rates_QL.hdf5 differ
diff --git a/pycqed/tests/test_data/20180414/121600_Resonator_scan-VFC_res3_init_/121600_Resonator_scan-VFC_res3_init_.hdf5 b/pycqed/tests/test_data/20180414/121600_Resonator_scan-VFC_res3_init_/121600_Resonator_scan-VFC_res3_init_.hdf5
index 7d63402933..f5168a4498 100755
Binary files a/pycqed/tests/test_data/20180414/121600_Resonator_scan-VFC_res3_init_/121600_Resonator_scan-VFC_res3_init_.hdf5 and b/pycqed/tests/test_data/20180414/121600_Resonator_scan-VFC_res3_init_/121600_Resonator_scan-VFC_res3_init_.hdf5 differ
diff --git a/pycqed/tests/test_data/20180414/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0.hdf5 b/pycqed/tests/test_data/20180414/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0.hdf5
index 0892a09727..bab2e1dc8b 100755
Binary files a/pycqed/tests/test_data/20180414/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0.hdf5 and b/pycqed/tests/test_data/20180414/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0/122115_spectroscopy_-VFC_res3_dac_channel_VFCQ6_-50.0.hdf5 differ
diff --git a/pycqed/tests/test_data/20180508/182642_SSRO_0_10.00/182642_SSRO_0_10.00.hdf5 b/pycqed/tests/test_data/20180508/182642_SSRO_0_10.00/182642_SSRO_0_10.00.hdf5
index b9572c68d3..b3b138eef4 100644
Binary files a/pycqed/tests/test_data/20180508/182642_SSRO_0_10.00/182642_SSRO_0_10.00.hdf5 and b/pycqed/tests/test_data/20180508/182642_SSRO_0_10.00/182642_SSRO_0_10.00.hdf5 differ
diff --git a/pycqed/tests/test_data/20180601/135117_RB_100seeds_QR/135117_RB_100seeds_QR.hdf5 b/pycqed/tests/test_data/20180601/135117_RB_100seeds_QR/135117_RB_100seeds_QR.hdf5
index 1650f3d62d..40d69ccab4 100644
Binary files a/pycqed/tests/test_data/20180601/135117_RB_100seeds_QR/135117_RB_100seeds_QR.hdf5 and b/pycqed/tests/test_data/20180601/135117_RB_100seeds_QR/135117_RB_100seeds_QR.hdf5 differ
diff --git a/pycqed/tests/test_data/20180606/144110_T1_2nd_exc_state__QL/144110_T1_2nd_exc_state__QL.hdf5 b/pycqed/tests/test_data/20180606/144110_T1_2nd_exc_state__QL/144110_T1_2nd_exc_state__QL.hdf5
index da910ac0e0..d234e07979 100644
Binary files a/pycqed/tests/test_data/20180606/144110_T1_2nd_exc_state__QL/144110_T1_2nd_exc_state__QL.hdf5 and b/pycqed/tests/test_data/20180606/144110_T1_2nd_exc_state__QL/144110_T1_2nd_exc_state__QL.hdf5 differ