diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
index 11580ca82e3de6a671e0245766423619f8276ea8..b0a4a85b416384b8d003444d471868612ac74d70 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
@@ -70,11 +70,10 @@ def _get_output_dir():
 
 def _run_vanadium_calibration():
     vanadium_runs = "95634_95647"
-    empty_runs = "95648_95654"
 
     pearl_obj = _setup_pearl_instrument(tt_mode=None)
-    results = pearl_obj.create_calibration_vanadium(vanadium_runs=vanadium_runs, empty_runs=empty_runs,
-                                                    absorption_corrections=True, long_mode=False)
+    results = pearl_obj.create_calibration_vanadium(run_in_range=vanadium_runs, do_absorb_corrections=True,
+                                                    long_mode=False)
     return results
 
 
@@ -89,6 +88,6 @@ def _setup_pearl_instrument(tt_mode):
 
     pearl_obj = Pearl(user_name=user_name, tt_mode=tt_mode, attenuation_file_name=attenuation_file_path,
                       calibration_directory=_get_calibration_dir(), output_directory=_get_output_dir(),
-                      calibration_mapping_file=calibration_map_file_path)
+                      calibration_config_path=calibration_map_file_path)
     return pearl_obj
 
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index 7a6704398d27b02db4a86f8ec976a9a7eacd65f4..41042f8f4f9f7802806c3b78b4db4b8dc5ae0c53 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -60,18 +60,17 @@ def _gen_required_files():
 
 
 def _run_vanadium_calibration():
-    vanadium_run = 78338
-    gen_absorb = True
+    vanadium_run = 95598
 
     polaris_obj = setup_polaris_instrument()
     # Try it without an output name
 
-    return polaris_obj.create_calibration_vanadium(run_in_range=vanadium_run,
-                                                   gen_absorb_correction=gen_absorb)
+    return polaris_obj.create_calibration_vanadium(run_in_range=vanadium_run, do_absorb_corrections=True,
+                                                   generate_absorb_corrections=True)
 
 
 def _run_focus():
-    run_number = 79514
+    run_number = 95599
     polaris_obj = setup_polaris_instrument()
     return polaris_obj.focus(run_number=run_number, input_mode="Individual")
 
@@ -79,7 +78,6 @@ def _run_focus():
 def _calibration_validation(cls, results):
     _validation_setup(cls)
     results_name = results[0].getName()
-    # TODO this name is completely wrong
     reference_file_name = "ISIS_Powder-POLARIS78338_Van_Cal.nxs"
     return results_name, reference_file_name
 
diff --git a/scripts/Diffraction/isis_powder/pearl.py b/scripts/Diffraction/isis_powder/pearl.py
index 9f3bda76c49bc5c1562633c7c8fdad53cefee9a4..119fe8902339e65dce1e3f90fde9e5250ad0bff0 100644
--- a/scripts/Diffraction/isis_powder/pearl.py
+++ b/scripts/Diffraction/isis_powder/pearl.py
@@ -34,7 +34,7 @@ class Pearl(AbstractInst):
         kwargs["tt_mode"] = "tt88"
         self._inst_settings.update_attributes(kwargs=kwargs)
 
-        run_details = self.get_run_details(run_number_string=int(run_in_range))
+        run_details = self.get_run_details(run_number_string=run_in_range)
         run_details.run_number = run_details.vanadium_run_numbers
 
         return self._create_calibration_vanadium(vanadium_runs=run_details.vanadium_run_numbers,
diff --git a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
index 48a315b2e0661fde7e75f439960bc834258ad657..54231ddb695fdbb4c6f08f12139ff221c904f6b5 100644
--- a/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
+++ b/scripts/Diffraction/isis_powder/polaris_routines/polaris_algs.py
@@ -103,21 +103,21 @@ def process_vanadium_for_focusing(bank_spectra, mask_path, spline_number):
 
 
 def _apply_bragg_peaks_masking(workspaces_to_mask, mask_list):
-
     index = 0
     output_workspaces = []
-    for ws in workspaces_to_mask:
-        output_workspaces.append(ws)
 
     for bank_mask_list in mask_list:
         if not bank_mask_list:
             continue
 
         output_name = "masked_vanadium-" + str(index + 1)
+        out_workspace = None
         for mask_params in bank_mask_list:
-            out_workspace = mantid.MaskBins(InputWorkspace=output_workspaces[index], OutputWorkspace=output_name,
+            out_workspace = mantid.MaskBins(InputWorkspace=workspaces_to_mask[index], OutputWorkspace=output_name,
                                             XMin=mask_params[0], XMax=mask_params[1])
-            output_workspaces[index] = out_workspace
+        if out_workspace:
+            output_workspaces.append(out_workspace)
+
         index += 1
 
     return output_workspaces
diff --git a/scripts/Diffraction/isis_powder/routines/calibrate.py b/scripts/Diffraction/isis_powder/routines/calibrate.py
index a3b3d80634aa1d3ef80a645d986c703dfddd001c..b33f5b2d11727722076c5ce7ea4ffb272150cbf7 100644
--- a/scripts/Diffraction/isis_powder/routines/calibrate.py
+++ b/scripts/Diffraction/isis_powder/routines/calibrate.py
@@ -30,7 +30,6 @@ def create_van(instrument, van, empty, absorb, gen_absorb):
 
     focused_vanadium = mantid.DiffractionFocussing(InputWorkspace=corrected_van_ws,
                                                    GroupingFileName=run_details.grouping_file_path)
-
     focused_spectra = common.extract_ws_spectra(focused_vanadium)
     # Crop back to sane TOF as for PEARL at least 20,000-40,000 microseconds is extrapolated
     # to 0-60,000 microseconds