Index: trunk/tests/test_output_data.py
===================================================================
diff -u -r41 -r42
--- trunk/tests/test_output_data.py	(.../test_output_data.py)	(revision 41)
+++ trunk/tests/test_output_data.py	(.../test_output_data.py)	(revision 42)
@@ -14,12 +14,6 @@
 from SDToolBox.data_acquisition import OutputData
 import SDToolBox.outputmessages as output_messages
 
-test_wave_variable_dict = {
-    'swh': 'Hs',
-    'pp1d': 'Tp',
-    'mwd': 'MWD',
-    'mwp': 'Tm',
-}
 
 class Test_create:
 
@@ -74,11 +68,11 @@
     def test_when_given_wave_cases_generates_output(self):
         # 1. Given
         # When using local data you can just replace the comment in these lines
-        # dir_test_data = TestUtils.get_local_test_data_dir('netCDF_Waves_data')
-        dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
+        dir_test_data = TestUtils.get_local_test_data_dir('netCDF_Waves_data')
+        # dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
         output_test_data = TestUtils.get_local_test_data_dir('output_data')
         input_data = data_acquisition.InputData()
-        input_data.input_dict = test_wave_variable_dict
+        input_data.input_variables = ['swh']
         input_data.coord_list = [(4.2, 2.4), ]
         netcdf_filepath = None
 
@@ -90,8 +84,7 @@
             netcdf_filepath = output_data.generate_netcdf(
                 dir_path=output_test_data,
                 base_name='test_wave',
-                dataset_code=None,
-                file_format='CF'
+                dataset_code=None
             )
         except Exception as e_info:
             pytest.fail(
@@ -109,7 +102,7 @@
     def test_when_no_arguments_given_no_valid_data_dict_then_raises(self):
         # 1. Given
         input_data = data_acquisition.InputData()
-        input_data.input_dict = test_wave_variable_dict
+        input_data.input_variables = ['swh']
         input_data.coord_list = [(4.2, 2.4), ]
         output_data = None
         generated_output = None
@@ -132,7 +125,7 @@
         dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
 
         input_data = data_acquisition.InputData()
-        input_data.input_dict = test_wave_variable_dict
+        input_data.input_variables = ['swh']
         input_data.coord_list = [(4.2, 2.4), ]
         return_value = None
 
@@ -166,7 +159,7 @@
         output_test_data = TestUtils.get_local_test_data_dir('output_data')
 
         input_data = data_acquisition.InputData()
-        input_data.input_dict = test_wave_variable_dict
+        input_data.input_variables = ['swh']
         input_data.coord_list = [(4.2, 2.4), ]
 
         # 2. When
@@ -177,8 +170,7 @@
             output_data.generate_output(
                 dir_path=output_test_data,
                 base_name='test_wave',
-                dataset_code=None,
-                file_format='CF'
+                dataset_code=None
             )
         except Exception as e_info:
             pytest.fail(