diff --git a/testing/models_basic/2D_ExHyHz/2D_ExHyHz.h5 b/testing/models_basic/2D_ExHyHz/2D_ExHyHz.h5
index e7ffa5ed..dd931933 100644
Binary files a/testing/models_basic/2D_ExHyHz/2D_ExHyHz.h5 and b/testing/models_basic/2D_ExHyHz/2D_ExHyHz.h5 differ
diff --git a/testing/models_basic/2D_ExHyHz/2D_ExHyHz.png b/testing/models_basic/2D_ExHyHz/2D_ExHyHz.png
index d877ef5e..001917e9 100644
Binary files a/testing/models_basic/2D_ExHyHz/2D_ExHyHz.png and b/testing/models_basic/2D_ExHyHz/2D_ExHyHz.png differ
diff --git a/testing/models_basic/2D_ExHyHz/2D_ExHyHz_diffs.png b/testing/models_basic/2D_ExHyHz/2D_ExHyHz_diffs.png
index 5c9c2067..2a329048 100644
Binary files a/testing/models_basic/2D_ExHyHz/2D_ExHyHz_diffs.png and b/testing/models_basic/2D_ExHyHz/2D_ExHyHz_diffs.png differ
diff --git a/testing/models_basic/2D_EyHxHz/2D_EyHxHz.h5 b/testing/models_basic/2D_EyHxHz/2D_EyHxHz.h5
index 83b936fd..de1b2ce0 100644
Binary files a/testing/models_basic/2D_EyHxHz/2D_EyHxHz.h5 and b/testing/models_basic/2D_EyHxHz/2D_EyHxHz.h5 differ
diff --git a/testing/models_basic/2D_EyHxHz/2D_EyHxHz.png b/testing/models_basic/2D_EyHxHz/2D_EyHxHz.png
index dad2d0c4..63684649 100644
Binary files a/testing/models_basic/2D_EyHxHz/2D_EyHxHz.png and b/testing/models_basic/2D_EyHxHz/2D_EyHxHz.png differ
diff --git a/testing/models_basic/2D_EyHxHz/2D_EyHxHz_diffs.png b/testing/models_basic/2D_EyHxHz/2D_EyHxHz_diffs.png
index c956994e..2528b559 100644
Binary files a/testing/models_basic/2D_EyHxHz/2D_EyHxHz_diffs.png and b/testing/models_basic/2D_EyHxHz/2D_EyHxHz_diffs.png differ
diff --git a/testing/models_basic/2D_EzHxHy/2D_EzHxHy.h5 b/testing/models_basic/2D_EzHxHy/2D_EzHxHy.h5
index dbaa528f..14945d28 100644
Binary files a/testing/models_basic/2D_EzHxHy/2D_EzHxHy.h5 and b/testing/models_basic/2D_EzHxHy/2D_EzHxHy.h5 differ
diff --git a/testing/models_basic/2D_EzHxHy/2D_EzHxHy.png b/testing/models_basic/2D_EzHxHy/2D_EzHxHy.png
index f3d4c419..7bb2457f 100644
Binary files a/testing/models_basic/2D_EzHxHy/2D_EzHxHy.png and b/testing/models_basic/2D_EzHxHy/2D_EzHxHy.png differ
diff --git a/testing/models_basic/2D_EzHxHy/2D_EzHxHy_diffs.png b/testing/models_basic/2D_EzHxHy/2D_EzHxHy_diffs.png
index c93e1b1f..29eb2559 100644
Binary files a/testing/models_basic/2D_EzHxHy/2D_EzHxHy_diffs.png and b/testing/models_basic/2D_EzHxHy/2D_EzHxHy_diffs.png differ
diff --git a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.h5 b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.h5
index f99d8192..1cea0a95 100644
Binary files a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.h5 and b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.h5 differ
diff --git a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.png b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.png
index 6444c877..9b16b255 100644
Binary files a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.png and b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D.png differ
diff --git a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D_diffs.png b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D_diffs.png
index 482b928b..882cdf91 100644
Binary files a/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D_diffs.png and b/testing/models_basic/cylinder_Ascan_2D/cylinder_Ascan_2D_diffs.png differ
diff --git a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.h5 b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.h5
index 7b735b59..c564bcf6 100644
Binary files a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.h5 and b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.h5 differ
diff --git a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.png b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.png
index bea18cbd..1eaa3771 100644
Binary files a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.png and b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive.png differ
diff --git a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive_diffs.png b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive_diffs.png
index 81585508..cdca4833 100644
Binary files a/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive_diffs.png and b/testing/models_basic/hertzian_dipole_dispersive/hertzian_dipole_dispersive_diffs.png differ
diff --git a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.h5 b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.h5
index fbcfee38..b7d6ffa6 100644
Binary files a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.h5 and b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.h5 differ
diff --git a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.png b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.png
index 16a088eb..64e65740 100644
Binary files a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.png and b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs.png differ
diff --git a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs_diffs.png b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs_diffs.png
index 195c4915..595c2091 100644
Binary files a/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs_diffs.png and b/testing/models_basic/hertzian_dipole_fs/hertzian_dipole_fs_diffs.png differ
diff --git a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.h5 b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.h5
index 4d5f50d6..b7d6ffa6 100644
Binary files a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.h5 and b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.h5 differ
diff --git a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.png b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.png
index 87596bbc..1ca6e526 100644
Binary files a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.png and b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical.png differ
diff --git a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical_diffs.png b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical_diffs.png
index 4c491206..961b2885 100644
Binary files a/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical_diffs.png and b/testing/models_basic/hertzian_dipole_fs_analytical/hertzian_dipole_fs_analytical_diffs.png differ
diff --git a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.h5 b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.h5
index 90f9edf7..6cabd971 100644
Binary files a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.h5 and b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.h5 differ
diff --git a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.png b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.png
index f3fdf369..772b4898 100644
Binary files a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.png and b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs.png differ
diff --git a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs_diffs.png b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs_diffs.png
index 097b18de..2d3ab359 100644
Binary files a/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs_diffs.png and b/testing/models_basic/hertzian_dipole_hs/hertzian_dipole_hs_diffs.png differ
diff --git a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.h5 b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.h5
index 23aa4c38..23e3a2cd 100644
Binary files a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.h5 and b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.h5 differ
diff --git a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.png b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.png
index 04affb13..1907cb5c 100644
Binary files a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.png and b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs.png differ
diff --git a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs_diffs.png b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs_diffs.png
index 544ec367..86f741e7 100644
Binary files a/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs_diffs.png and b/testing/models_basic/magnetic_dipole_fs/magnetic_dipole_fs_diffs.png differ
diff --git a/testing/test_models.py b/testing/test_models.py
index 01862574..ac99b600 100644
--- a/testing/test_models.py
+++ b/testing/test_models.py
@@ -25,7 +25,7 @@ import h5py
 import matplotlib.pyplot as plt
 import numpy as np
 
-from tests.analytical_solutions import hertzian_dipole_fs
+from testing.analytical_solutions import hertzian_dipole_fs
 
 logger = logging.getLogger(__name__)
 
@@ -74,7 +74,7 @@ for i, model in enumerate(testmodels):
 
     # Run model
     file = basepath / model / model
-    gprMax.run(inputfile=file.with_suffix('.in'), gpu=[0])
+    gprMax.run(inputfile=file.with_suffix('.in'), gpu=None)
 
     # Special case for analytical comparison
     if model == 'hertzian_dipole_fs_analytical':