diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html
index d48e54e8..063ef8cd 100644
--- a/RIGS/templates/event_checklist_form.html
+++ b/RIGS/templates/event_checklist_form.html
@@ -124,7 +124,7 @@
                                 {% render_field form.date class+="form-control col-8" %}
                                 {% endif %}
                             </div>
-                            <div class="form-group form-row">
+                            <div class="form-group form-row" id="{{ form.venue.id_for_label }}-group">
                                 <label for="{{ form.venue.id_for_label }}"
                                 class="col-4 control-label">{{ form.venue.label }}</label>
                                 <select id="{{ form.venue.id_for_label }}" name="{{ form.venue.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='venue' %}">
@@ -135,7 +135,7 @@
                                 {% endif %}
                                 </select>
                             </div>
-                            <div class="form-group form-row">
+                            <div class="form-group form-row" id="{{ form.power_mic.id_for_label }}-group">
                             <label for="{{ form.power_mic.id_for_label }}"
                                 class="col-4 control-label">{{ form.power_mic.help_text }}</label>
                                 <select id="{{ form.power_mic.id_for_label }}" name="{{ form.power_mic.name }}" class="form-control selectpicker col-8" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required="true">
diff --git a/RIGS/tests/pages.py b/RIGS/tests/pages.py
index edfbdf60..047cdd72 100644
--- a/RIGS/tests/pages.py
+++ b/RIGS/tests/pages.py
@@ -230,7 +230,7 @@ class CreateEventChecklist(FormPage):
     URL_TEMPLATE = 'event/{event_id}/checklist'
 
     _submit_locator = (By.XPATH, "//button[@type='submit' and contains(., 'Save')]")
-    _power_mic_selector = (By.CSS_SELECTOR, ".bootstrap-select")
+    _power_mic_selector = (By.XPATH, "//div[@id='id_power_mic-group']//div[contains(@class, 'bootstrap-select')]")
     _add_vehicle_locator = (By.XPATH, "//button[contains(., 'Vehicle')]")
     _add_crew_locator = (By.XPATH, "//button[contains(., 'Crew')]")
 
diff --git a/RIGS/tests/test_functional.py b/RIGS/tests/test_functional.py
index fdd6b03e..609e363a 100644
--- a/RIGS/tests/test_functional.py
+++ b/RIGS/tests/test_functional.py
@@ -19,43 +19,23 @@ from RIGS.tests import regions
 from . import pages
 
 
-class TestEventValidation(TestCase):
+class BaseCase(TestCase):
     @classmethod
     def setUpTestData(cls):
         cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-        cls.profile = models.Profile.objects.create(username="EventValidationTest", email="EVT@test.com", is_superuser=True, is_active=True, is_staff=True)
-
-    def setUp(self):
-        self.profile.set_password('testuser')
-        self.profile.save()
-        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
-
-    def test_create(self):
-        url = reverse('event_create')
-        # end time before start access after start
-        response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00), 'end_time': datetime.time(9, 00), 'access_at': datetime.datetime(2020, 1, 5, 10)})
-        self.assertFormError(response, 'form', 'end_time', "Unless you've invented time travel, the event can't finish before it has started.")
-        self.assertFormError(response, 'form', 'access_at', "Regardless of what some clients might think, access time cannot be after the event has started.")
-
-
-class ClientEventAuthorisationTest(TestCase):
-    auth_data = {
-        'name': 'Test ABC',
-        'po': '1234ABCZXY',
-        'account_code': 'ABC TEST 12345',
-        'uni_id': 1234567890,
-        'tos': True
-    }
-
-    def setUp(self):
-        self.profile = models.Profile.objects.get_or_create(
+        cls.profile = models.Profile.objects.get_or_create(
             first_name='Test',
             last_name='TEC User',
             username='eventauthtest',
             email='teccie@functional.test',
             is_superuser=True  # lazily grant all permissions
         )[0]
-        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+
+    def setUp(self):
+        super().setUp()
+        self.profile.set_password('testuser')
+        self.profile.save()
+        self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
         venue = models.Venue.objects.create(name='Authorisation Test Venue')
         client = models.Person.objects.create(name='Authorisation Test Person', email='authorisation@functional.test')
         organisation = models.Organisation.objects.create(name='Authorisation Test Organisation', union_account=True)
@@ -66,6 +46,28 @@ class ClientEventAuthorisationTest(TestCase):
             person=client,
             organisation=organisation,
         )
+
+
+class TestEventValidation(BaseCase):
+    def test_create(self):
+        url = reverse('event_create')
+        # end time before start access after start
+        response = self.client.post(url, {'start_date': datetime.date(2020, 1, 1), 'start_time': datetime.time(10, 00), 'end_time': datetime.time(9, 00), 'access_at': datetime.datetime(2020, 1, 5, 10)})
+        self.assertFormError(response, 'form', 'end_time', "Unless you've invented time travel, the event can't finish before it has started.")
+        self.assertFormError(response, 'form', 'access_at', "Regardless of what some clients might think, access time cannot be after the event has started.")
+
+
+class ClientEventAuthorisationTest(BaseCase):
+    auth_data = {
+        'name': 'Test ABC',
+        'po': '1234ABCZXY',
+        'account_code': 'ABC TEST 12345',
+        'uni_id': 1234567890,
+        'tos': True
+    }
+
+    def setUp(self):
+        super().setUp()
         self.hmac = signing.dumps({'pk': self.event.pk, 'email': 'authemail@function.test',
                                    'sent_by': self.profile.pk})
         self.url = reverse('event_authorise', kwargs={'pk': self.event.pk, 'hmac': self.hmac})
@@ -131,45 +133,22 @@ class ClientEventAuthorisationTest(TestCase):
         self.assertEqual(mail.outbox[1].to, [settings.AUTHORISATION_NOTIFICATION_ADDRESS])
 
 
-class TECEventAuthorisationTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        cls.profile = models.Profile.objects.get_or_create(
-            first_name='Test',
-            last_name='TEC User',
-            username='eventauthtest',
-            email='teccie@nottinghamtec.co.uk',
-            is_superuser=True  # lazily grant all permissions
-        )[0]
-        cls.profile.set_password('eventauthtest123')
-        cls.profile.save()
-
+class TECEventAuthorisationTest(BaseCase):
     def setUp(self):
-        self.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
-        venue = models.Venue.objects.create(name='Authorisation Test Venue')
-        client = models.Person.objects.create(name='Authorisation Test Person', email='authorisation@functional.test')
-        organisation = models.Organisation.objects.create(name='Authorisation Test Organisation', union_account=False)
-        self.event = models.Event.objects.create(
-            name='Authorisation Test',
-            start_date=date.today(),
-            venue=venue,
-            person=client,
-            organisation=organisation,
-        )
+        super().setUp()
         self.url = reverse('event_authorise_request', kwargs={'pk': self.event.pk})
 
     def test_email_check(self):
         self.profile.email = 'teccie@someotherdomain.com'
         self.profile.save()
 
-        self.assertTrue(self.client.login(username=self.profile.username, password='eventauthtest123'))
-
         response = self.client.post(self.url)
 
         self.assertContains(response, 'must have an @nottinghamtec.co.uk email address')
 
     def test_request_send(self):
-        self.assertTrue(self.client.login(username=self.profile.username, password='eventauthtest123'))
+        self.profile.email = 'teccie@nottinghamtec.co.uk'
+        self.profile.save()
         response = self.client.post(self.url)
         self.assertContains(response, 'This field is required.')
 
diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py
index 4cbb8fd7..984896b9 100644
--- a/RIGS/tests/test_interaction.py
+++ b/RIGS/tests/test_interaction.py
@@ -657,11 +657,14 @@ class TestHealthAndSafety(BaseRigboardTest):
             email='teccie@functional.test',
             is_superuser=True  # lazily grant all permissions
         )[0]
+        self.venue = models.Venue.objects.create(name="Venue 1")
+
         self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL,
                                                      start_date=date.today() + timedelta(days=6),
                                                      description="start future no end",
                                                      purchase_order='TESTPO',
-                                                     person=self.client)
+                                                     person=self.client,
+                                                     venue=self.venue)
         self.testEvent2 = models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL,
                                                       start_date=date.today() + timedelta(days=6),
                                                       description="start future no end",
@@ -839,21 +842,19 @@ class TestHealthAndSafety(BaseRigboardTest):
 
         vehicle_name = 'Brian'
         self.driver.find_element(By.XPATH, '//*[@name="vehicle_-1"]').send_keys(vehicle_name)
-        driver = base_regions.BootstrapSelectElement(self.page, self.driver.find_element(By.XPATH, '(//*[contains(@class,"bootstrap-select")])[2]'))
+        driver = base_regions.BootstrapSelectElement(self.page, self.driver.find_element(By.XPATH, '//tr[@id="vehicles_-1"]//div[contains(@class, "bootstrap-select")]'))
         driver.search(self.profile.name)
-        # driver.toggle()
 
         crew = self.profile
         role = "MIC"
-        crew_select = base_regions.BootstrapSelectElement(self.page, self.driver.find_element(By.XPATH, '(//*[contains(@class,"bootstrap-select")])[3]'))
+        crew_select = base_regions.BootstrapSelectElement(self.page, self.driver.find_element(By.XPATH, '//tr[@id="crew_-1"]//div[contains(@class, "bootstrap-select")]'))
         start_time = base_regions.DateTimePicker(self.page, self.driver.find_element(By.XPATH, '//*[@name="start_-1"]'))
         end_time = base_regions.DateTimePicker(self.page, self.driver.find_element(By.XPATH, '//*[@name="end_-1"]'))
 
         start_time.set_value(timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0)))
-        # TODO Validation of end before start
+        # TODO Test validation of end before start
         end_time.set_value(timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30)))
         crew_select.search(crew.name)
-        # crew_select.toggle()
         self.driver.find_element(By.XPATH, '//*[@name="role_-1"]').send_keys(role)
 
         self.page.select_size('Small')
diff --git a/RIGS/tests/test_unit.py b/RIGS/tests/test_unit.py
index beaa83e1..31f603b4 100644
--- a/RIGS/tests/test_unit.py
+++ b/RIGS/tests/test_unit.py
@@ -465,10 +465,12 @@ class TestHSLogic(TestCase):
                                                     is_active=True, is_staff=True)
 
         cls.vatrate = models.VatRate.objects.create(start_at='2014-03-05', rate=0.20, comment='test1')
+        cls.venue = models.Venue.objects.create(name="Venue 1")
 
         cls.events = {
             1: models.Event.objects.create(name="TE E1", start_date=date.today(),
-                                           description="This is an event description\nthat for a very specific reason spans two lines."),
+                                           description="This is an event description\nthat for a very specific reason spans two lines.",
+                                           venue=cls.venue),
             2: models.Event.objects.create(name="TE E2", start_date=date.today()),
         }
 
@@ -509,8 +511,9 @@ class TestHSLogic(TestCase):
                                                     extinguishers_location="Somewhere, I forgot",
                                                     earthing=False,
                                                     pat=False,
-                                                    event_size=0
-                                                    ),
+                                                    event_size=0,
+                                                    date=timezone.now(),
+                                                    venue=cls.venue),
         }
 
     def setUp(self):