diff --git a/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py b/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py
index 3e7d0c66f1..e244fb497c 100644
--- a/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py
+++ b/MDANSE/Tests/UnitTests/Analysis/test_dynamics.py
@@ -39,7 +39,7 @@ def test_vacf(trajectory, interp_order, normalise):
     parameters = {}
     parameters['frames'] = (0, 10, 1)
     parameters['interpolation_order'] = interp_order
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['normalize'] = normalise
     parameters['trajectory'] = short_traj
diff --git a/MDANSE/Tests/UnitTests/Analysis/test_meansquare.py b/MDANSE/Tests/UnitTests/Analysis/test_meansquare.py
index ea42f4d062..88a0da38d3 100644
--- a/MDANSE/Tests/UnitTests/Analysis/test_meansquare.py
+++ b/MDANSE/Tests/UnitTests/Analysis/test_meansquare.py
@@ -44,7 +44,7 @@ def test_basic_meansquare(trajectory):
     temp_name = tempfile.mktemp()
     parameters = {}
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     msd = REGISTRY['job']['msd']()
@@ -57,7 +57,7 @@ def test_parallel_meansquare(trajectory):
     temp_name = tempfile.mktemp()
     parameters = {}
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     msd = REGISTRY['job']['msd']()
@@ -65,7 +65,7 @@ def test_parallel_meansquare(trajectory):
     temp_name2 = tempfile.mktemp()
     parameters = {}
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name2, ('hdf',))
+    parameters['output_files'] = (temp_name2, ('HDFFormat',))
     parameters['running_mode'] = ('threadpool',4)
     parameters['trajectory'] = short_traj
     msd_par = REGISTRY['job']['msd']()
@@ -81,7 +81,7 @@ def test_atom_selection(trajectory):
     temp_name = tempfile.mktemp()
     parameters = {}
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     msd = REGISTRY['job']['msd']()
diff --git a/MDANSE/Tests/UnitTests/Analysis/test_scattering.py b/MDANSE/Tests/UnitTests/Analysis/test_scattering.py
index c6007e4f32..0f06c44260 100644
--- a/MDANSE/Tests/UnitTests/Analysis/test_scattering.py
+++ b/MDANSE/Tests/UnitTests/Analysis/test_scattering.py
@@ -77,7 +77,7 @@ def test_dcsf(trajectory, qvector_spherical_lattice):
     parameters['atom_transmutation'] = None
     parameters['frames'] = (0, 10, 1)
     parameters['instrument_resolution'] = ('ideal', {})
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['q_vectors'] = qvector_spherical_lattice
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
@@ -95,7 +95,7 @@ def test_disf(trajectory, qvector_spherical_lattice):
     parameters['atom_transmutation'] = None
     parameters['frames'] = (0, 10, 1)
     parameters['instrument_resolution'] = ('ideal', {})
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['q_vectors'] = qvector_spherical_lattice
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
@@ -112,7 +112,7 @@ def test_eisf(trajectory, qvector_spherical_lattice):
     parameters['atom_selection'] = None
     parameters['atom_transmutation'] = None
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['q_vectors'] = qvector_spherical_lattice
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
@@ -130,7 +130,7 @@ def test_gdisf(trajectory):
     parameters['atom_transmutation'] = None
     parameters['frames'] = (0, 10, 1)
     parameters['instrument_resolution'] = ('ideal', {})
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['q_shells'] = (2.0,12.2,2.0)
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
@@ -148,7 +148,7 @@ def test_gdisf(trajectory):
 #     parameters['atom_transmutation'] = None
 #     parameters['frames'] = (0, 10, 1)
 #     parameters['instrument_resolution'] = ('ideal', {})
-#     parameters['output_files'] = (temp_name, ('hdf',))
+#     parameters['output_files'] = (temp_name, ('HDFFormat',))
 #     parameters['q_vectors'] = qvector_spherical_lattice
 #     parameters['running_mode'] = ('monoprocessor',)
 #     parameters['trajectory'] = short_traj
diff --git a/MDANSE/Tests/UnitTests/Analysis/test_thermodynamics.py b/MDANSE/Tests/UnitTests/Analysis/test_thermodynamics.py
index 021d84ab48..e2bef66567 100644
--- a/MDANSE/Tests/UnitTests/Analysis/test_thermodynamics.py
+++ b/MDANSE/Tests/UnitTests/Analysis/test_thermodynamics.py
@@ -36,7 +36,7 @@ def test_temperature(trajectory, interp_order):
     parameters = {}
     parameters['frames'] = (0, 10, 1)
     parameters['interpolation_order'] = interp_order
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     temp = IJob.create('Temperature')
@@ -51,7 +51,7 @@ def test_temperature_nonzero(trajectory, interp_order):
     parameters = {}
     parameters['frames'] = (0, 10, 1)
     parameters['interpolation_order'] = interp_order
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     temp = IJob.create('Temperature')
@@ -66,7 +66,7 @@ def test_density(trajectory):
     temp_name = tempfile.mktemp()
     parameters = {}
     parameters['frames'] = (0, 10, 1)
-    parameters['output_files'] = (temp_name, ('hdf',))
+    parameters['output_files'] = (temp_name, ('HDFFormat',))
     parameters['running_mode'] = ('monoprocessor',)
     parameters['trajectory'] = short_traj
     den = IJob.create('Density')