diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
index d18860464a3c5935e726181f1cb48112dab7e74a..3a409f4a856d9e979c20ceda5e35baa74f1b9b68 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/presenter.py
@@ -7,6 +7,7 @@
 # pylint: disable=invalid-name
 from __future__ import (absolute_import, division, print_function)
 
+from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT
 from mantidqt.utils.asynchronous import AsyncTask
 from mantid.simpleapi import logger
 from mantidqt.utils.observer_pattern import Observable
@@ -69,12 +70,7 @@ class CalibrationPresenter(object):
         self.emit_enable_button_signal()
 
     def set_instrument_override(self, instrument):
-        if instrument == 0:
-            instrument = "ENGINX"
-        elif instrument == 1:
-            instrument = "IMAT"
-        else:
-            raise ValueError("Invalid instrument index")
+        instrument = INSTRUMENT_DICT[instrument]
         self.view.set_instrument_override(instrument)
         self.instrument = instrument
 
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index 553a0190b18d31929179b8f0577a2e276180f2fd..c2ada5a0ddb7f3cd5cf59ce9932278ded80452c0 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -61,11 +61,6 @@ class CalibrationPresenterTest(unittest.TestCase):
         self.view.set_check_plot_output_enabled.assert_called_with(False)
 
     def test_controls_enabled_enables_both(self):
-        self.presenter.set_calibrate_controls_enabled(False)
-
-        self.view.set_calibrate_button_enabled.assert_called_with(False)
-        self.view.set_check_plot_output_enabled.assert_called_with(False)
-
         self.presenter.set_calibrate_controls_enabled(True)
 
         self.view.set_calibrate_button_enabled.assert_called_with(True)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py b/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2dc972abc74d2c1e1d812fee5eb92e8f5213c5cd 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/common/__init__.py
@@ -0,0 +1,6 @@
+"""
+Holds some common constants across all tabs.
+"""
+
+# Dictionary of indexes for instruments.
+INSTRUMENT_DICT = {0: "ENGINX", 1: "IMAT"}
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
index ac9f24bd4b703df4c43ff187cdc97f09734fa3fa..de3d38777cf81fe6311cb593bd6d29671cb7c1d1 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/presenter.py
@@ -9,6 +9,7 @@ from __future__ import (absolute_import, division, print_function)
 
 from qtpy.QtWidgets import QMessageBox
 
+from Engineering.gui.engineering_diffraction.tabs.common import INSTRUMENT_DICT
 from mantidqt.utils.asynchronous import AsyncTask
 from mantidqt.utils.observer_pattern import Observer
 from mantid.simpleapi import logger
@@ -54,12 +55,7 @@ class FocusPresenter(object):
         self.worker.start()
 
     def set_instrument_override(self, instrument):
-        if instrument == 0:
-            instrument = "ENGINX"
-        elif instrument == 1:
-            instrument = "IMAT"
-        else:
-            raise ValueError("Invalid instrument index")
+        instrument = INSTRUMENT_DICT[instrument]
         self.view.set_instrument_override(instrument)
         self.instrument = instrument
 
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index 4d2e22fa50d1125aaacdedb112a844bc2e0f8954..dc5579cb04268581eaa362b3bc5cc7fada66a550 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -67,22 +67,25 @@ class FocusPresenterTest(unittest.TestCase):
         logger.assert_called_with(str(fail_info))
         self.assertEqual(emit.call_count, 1)
 
-    def test_get_banks(self):
+    def test_get_both_banks(self):
         self.view.get_north_bank.return_value = True
         self.view.get_south_bank.return_value = True
 
         self.assertEqual(["North", "South"], self.presenter._get_banks())
 
+    def test_get_north_bank(self):
         self.view.get_north_bank.return_value = True
         self.view.get_south_bank.return_value = False
 
         self.assertEqual(["North"], self.presenter._get_banks())
 
+    def test_get_south_bank(self):
         self.view.get_north_bank.return_value = False
         self.view.get_south_bank.return_value = True
 
         self.assertEqual(["South"], self.presenter._get_banks())
 
+    def test_getting_no_banks(self):
         self.view.get_north_bank.return_value = False
         self.view.get_south_bank.return_value = False