diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.in b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.in
index 45a87360..b6e72b59 100755
--- a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.in
+++ b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.in
@@ -3,11 +3,6 @@
 #dx_dy_dz: 0.001 0.001 0.001
 #time_window: 3e-9
 
-#waveform: gaussiandot 1 1e9 myWave
-#hertzian_dipole: z 0.050 0.050 0.050 myWave
-#rx: 0.070 0.070 0.070
-
-python:
-for time in range(1,50):
-    print('#snapshot: 0.001 0.001 0.001 0.099 0.099 0.099 0.001 0.001 0.001 {} {}'.format(0.1e-9 * time, 'snap' + str(time)))
-end_python:
+#waveform: gaussiandot 1 1e9 mypulse
+#hertzian_dipole: z 0.050 0.050 0.050 mypulse
+#rx: 0.070 0.070 0.070 output Ex Ey Ez Hx Hy Hz
\ No newline at end of file
diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.out b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.out
index b874ea2f..94aa88c4 100644
Binary files a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.out and b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs.out differ
diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.pdf b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.pdf
deleted file mode 100644
index 4cd34746..00000000
Binary files a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.pdf and /dev/null differ
diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.png b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.png
new file mode 100644
index 00000000..9e48ce23
Binary files /dev/null and b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical.png differ
diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.pdf b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.pdf
deleted file mode 100644
index 3cf23aaa..00000000
Binary files a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.pdf and /dev/null differ
diff --git a/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.png b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.png
new file mode 100644
index 00000000..6554172f
Binary files /dev/null and b/tests/analytical/hertzian_dipole_fs/hertzian_dipole_fs_vs_analytical_diffs.png differ
diff --git a/tests/analytical_solutions.py b/tests/analytical_solutions.py
index 298c5474..356378be 100644
--- a/tests/analytical_solutions.py
+++ b/tests/analytical_solutions.py
@@ -1,15 +1,14 @@
 import numpy as np
 
 from gprMax.constants import c, e0
-from gprMax.utilities import round_value
 from gprMax.waveforms import Waveform
 
 
-def hertzian_dipole_fs(timewindow, dt, dxdydz, rx):
+def hertzian_dipole_fs(iterations, dt, dxdydz, rx):
     """Analytical solution of a z-directed Hertzian dipole in free space with a Gaussian current waveform (http://dx.doi.org/10.1016/0021-9991(83)90103-1).
     
     Args:
-        timewindow (float): Length of time window (seconds).
+        iterations (int): Number of time steps.
         dt (float): Time step (seconds).
         dxdydz (float): Tuple of spatial resolution (metres).
         rx (float): Tuple of coordinates of receiver position relative to transmitter position (metres).
@@ -37,8 +36,8 @@ def hertzian_dipole_fs(timewindow, dt, dxdydz, rx):
     wdot.freq = w.freq
 
     # Time
-    iterations = round_value(timewindow / dt)
-    time = np.linspace(0, timewindow, iterations)
+    time = np.linspace(0, 1, iterations)
+    time *= (iterations * dt)
 
     # Spatial resolution
     dx = dxdydz[0]
diff --git a/tests/geometry/geometry_averaging.in b/tests/geometry/geometry_averaging.in
deleted file mode 100755
index 7a5515a9..00000000
--- a/tests/geometry/geometry_averaging.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#title: Test of geometry commands and averaging behaviour
-#domain: 0.1 0.1 0.1
-#time_window: 1
-#dx_dy_dz: 0.001 0.001 0.001
-
-#material: 2 0 1 0 mat2
-#material: 3 0 1 0 mat3
-#material: 4 0 1 0 mat4
-#material: 5 0 1 0 mat5
-
-plate: 0.050 0.010 0.030 0.050 0.030 0.050 mat2
-
-box: 0.020 0.020 0.020 0.040 0.040 0.040 mat2
-
-cylinder: 0.090 0.020 0.010 0.090 0.080 0.010 0.005 mat3
-cylinder: 0.050 0.050 0.020 0.070 0.070 0.080 0.005 mat3
-
-#cylindrical_sector: x 0.050 0.050 0.040 0.050 0.015 0 90 mat3
-
-sphere: 0.100 0.100 0.100 0.040 mat4
-
-#triangle: 0.020 0.020 0.020 0.020 0.035 0.035 0.020 0.050 0.020 0 mat5
-triangle: 0.020 0.020 0.020 0.020 0.035 0.035 0.020 0.050 0.020 0.010 mat5
-
-
-#geometry_view: 0 0 0 0.1 0.1 0.1 0.001 0.001 0.001 geometry_averaging_solid n
-#geometry_view: 0 0 0 0.1 0.1 0.1 0.001 0.001 0.001 geometry_averaging_IDs f