diff --git a/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py b/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
index b126b38f7372c7f69919e5c6e84384e2db9c5b0b..c98fd5bcc713fd62c0d0850a59609bf3c458c5eb 100644
--- a/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
@@ -17,6 +17,7 @@ from sans.common.enums import SANSFacility
 from sans.test_helper.test_director import TestDirector
 from sans.state.data import get_data_builder
 from sans.state.mask import get_mask_builder
+from sans.state.move import get_move_builder
 from sans.common.file_information import SANSFileInformationFactory
 
 
@@ -89,14 +90,13 @@ class SANSMaskWorkspaceTest(unittest.TestCase):
         self.assertTrue(len(expected_spectra) == len(masked_spectra),
                         "{} does not equal {}".format(len(expected_spectra), len(masked_spectra)))
         for expected, actual in zip(sorted(expected_spectra), sorted(masked_spectra)):
-            self.assertTrue(expected == actual)
+            self.assertTrue(expected == actual, "{} does not equal {}".format(expected, actual))
 
     def _do_assert_non_masked(self, workspace, expected_spectra):
         # Remove duplicate masks from expected
         expected_spectra = list(set(expected_spectra))
 
         non_masked_spectra = list(get_non_masked_spectrum_numbers(workspace))
-
         self.assertTrue(len(expected_spectra) == len(non_masked_spectra),
                         "Expected length {}, got length {}".format(len(expected_spectra), len(non_masked_spectra)))
         for expected, actual in zip(sorted(expected_spectra), sorted(non_masked_spectra)):
@@ -425,10 +425,11 @@ class SANSMaskWorkspaceTest(unittest.TestCase):
         expected_spectra = []
         # The strange double pattern arises from the offset of the SANS2D tube geometry (see InstrumentView)
         for y in range(60, 120):
-            if y % 2:
-                expected_spectra.extend(((y * 512 + 9) + x for x in range(0, 257)))
+            if y % 2 == 0:
+                expected_spectra.extend(((y * 512) + 9 + x for x in range(0, 255)))
             else:
-                expected_spectra.extend(((y * 512 + 9) + x for x in range(0, 255)))
+                expected_spectra.extend(((y * 512) + 9 + x for x in range(0, 257)))
+        expected_spectra.extend((x for x in range(92169, 122889)))  # HAB
 
         mask_builder.set_use_mask_phi_mirror(phi_mirror)
         mask_builder.set_phi_min(phi_min)
@@ -512,8 +513,12 @@ class SANSMaskWorkspaceTest(unittest.TestCase):
 
         mask_info = mask_builder.build()
 
+        move_builder = get_move_builder(data_info)
+        move_builder.set_center_position(0.)
+        move_info = move_builder.build()
+
         test_director = TestDirector()
-        test_director.set_states(data_state=data_info, mask_state=mask_info)
+        test_director.set_states(data_state=data_info, mask_state=mask_info, move_state=move_info)
         state = test_director.construct()
 
         workspace = self._load_workspace(state)