Index: trunk/SDToolBox/extract_data.py
===================================================================
diff -u -r108 -r109
--- trunk/SDToolBox/extract_data.py	(.../extract_data.py)	(revision 108)
+++ trunk/SDToolBox/extract_data.py	(.../extract_data.py)	(revision 109)
@@ -268,8 +268,12 @@
 
             return output_data
 
-        def __get_unique_indices(self, nn_idx: np.array) -> np.array:
+        def __get_unique_indices(
+                self,
+                nn_idx: Tuple[list, list]) -> Tuple[Tuple[list, list], list]:
             # Get unique indices.
+            if not isinstance(nn_idx[0], list):
+                nn_idx = [nn_idx[0]], [nn_idx[1]]
             combined_array = np.stack(nn_idx, axis=-1)
             unique_nn, unique_idx = \
                 np.unique(combined_array, return_index=True, axis=0)
@@ -393,7 +397,7 @@
                 output_values=cases_dict[OutputData.var_lon_key],
                 is_gridded=input_data.is_gridded
                 )
-            return nn_lat_idx, nn_lon_idx
+            return nn_lon_idx, nn_lat_idx
 
         def _set_nn(
                 self,
Index: trunk/tests/test_extract_data.py
===================================================================
diff -u -r106 -r109
--- trunk/tests/test_extract_data.py	(.../test_extract_data.py)	(revision 106)
+++ trunk/tests/test_extract_data.py	(.../test_extract_data.py)	(revision 109)
@@ -48,14 +48,14 @@
     @pytest.mark.systemtest
     @pytest.mark.parametrize(
         "input_variables",
-        [(['swh']), (['u10']), (['msl_p'])],
+        [(['swh']), (['u10']), (['msl'])],
         ids=['Waves', 'Wind', 'SLP'])
     def test_when_extract_single_point_from_era5_dir_then_returns_output(
             self, input_variables: List[str]):
         # 1. Given
         # When using local data you can just replace the comment in these lines
-        dir_test_data = TestUtils.get_local_test_data_dir('era5_test_data')
-        # dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
+        # dir_test_data = TestUtils.get_local_test_data_dir('era5_test_data')
+        dir_test_data = 'P:\\metocean-data\\open\\ERA5\\data\\Global'
 
         input_data = InputData()
         input_data.input_variables = input_variables
@@ -77,8 +77,11 @@
         assert data_dict[output_data.var_time_key] is not None
         assert data_dict[output_data.var_lon_key] is not None
         assert data_dict[output_data.var_lat_key] is not None
-        assert data_dict[output_data.var_val_key] is not None
-        assert data_dict[output_data.var_val_key]['SWH'] is not None
+        variables_dict = data_dict[output_data.var_val_key]
+        assert variables_dict is not None
+        for input_variable in input_variables:
+            assert variables_dict[input_variable] is not None, '' + \
+                'Not found variable {} in data dict.'.format(input_variable)
 
 
 class Test_get_earth: