diff --git a/RIGS/templates/partials/event_row.html b/RIGS/templates/partials/event_row.html
index 599443e6..2d0abfdf 100644
--- a/RIGS/templates/partials/event_row.html
+++ b/RIGS/templates/partials/event_row.html
@@ -1,7 +1,7 @@
 {% load namewithnotes from filters %}
 {% load markdown_tags %}
 
-<div class="card h-100 border-3 {{ border_class }}">
+<div class="card h-100 border-3 {{ border_class }} event-row">
     <div class="card-header {{ header_bg }} {{ header_text }} py-3">
         <div class="d-flex justify-content-between align-items-center">
             <span class="d-flex align-items-center">
@@ -21,7 +21,7 @@
     <div class="card-body">
         <div class="row align-items-start">
 
-            <div class="col-md-2 border-end">
+            <div class="col-md-2 border-end event-dates">
                 <div class="mb-2">
                     <small class="text-muted">Meet at:</small>
                     {% if event.meet_at %}
diff --git a/RIGS/tests/pages.py b/RIGS/tests/pages.py
index 977e0bb8..c6d9da24 100644
--- a/RIGS/tests/pages.py
+++ b/RIGS/tests/pages.py
@@ -16,14 +16,14 @@ class Rigboard(BasePage):
     URL_TEMPLATE = reverse('rigboard')
 
     _add_item_selector = (By.XPATH, "//a[contains(@class,'btn-primary') and contains(., 'New')]")
-    _event_row_locator = (By.ID, 'event_row')
+    _event_row_locator = (By.CLASS_NAME, "event-row")
 
     def add(self):
         self.find_element(*self._add_item_selector).click()
 
     class EventListRow(Region):
         _event_number_locator = (By.ID, "event_number")
-        _event_dates_locator = (By.ID, "event_dates")
+        _event_dates_locator = (By.CLASS_NAME, "event-dates")
         _event_details_locator = (By.ID, "event_details")
         _event_mic_locator = (By.ID, "event_mic")
 
diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py
index 9984deae..85735dae 100644
--- a/RIGS/tests/test_interaction.py
+++ b/RIGS/tests/test_interaction.py
@@ -91,8 +91,8 @@ class TestRigboard(BaseRigboardTest):
         #    self.live_server_url + '/event/create/', self.driver.current_url)
 
     def test_event_order(self):
-        self.assertIn(self.testEvent.start_date.strftime('%a %d/%m/%Y'), self.page.events[0].dates)
-        self.assertIn(self.testEvent2.start_date.strftime('%a %d/%m/%Y'), self.page.events[1].dates)
+        self.assertIn(self.testEvent.start_date.strftime('%-d %b %Y'), self.page.events[0].dates)
+        self.assertIn(self.testEvent2.start_date.strftime('%-d %b %Y'), self.page.events[1].dates)
 
     def test_add_button(self):
         self.page.add()
diff --git a/assets/tests/test_interaction.py b/assets/tests/test_interaction.py
index 32537767..aff8423a 100644
--- a/assets/tests/test_interaction.py
+++ b/assets/tests/test_interaction.py
@@ -244,6 +244,7 @@ class TestSupplierList(AutoLoginTest):
 
         self.page.set_query("")
         self.page.search()
+        time.sleep(1)
         self.assertTrue(len(self.page.suppliers) == 7)
 
         self.page.set_query("This is not a supplier")
diff --git a/training/tests/test_interaction.py b/training/tests/test_interaction.py
index 570e7243..ce24cadc 100644
--- a/training/tests/test_interaction.py
+++ b/training/tests/test_interaction.py
@@ -17,8 +17,8 @@ def select_super(page, supervisor):
     assert page.supervisor_selector.is_open
     page.supervisor_selector.search(supervisor.name[:-6])
     time.sleep(2)  # Slow down for javascript
+    page.supervisor_selector.set_option(supervisor.name, True)
     assert page.supervisor_selector.options[0].selected
-    page.supervisor_selector.toggle()
 
 
 def test_add_qualification(logged_in_browser, live_server, trainee, supervisor, training_item):
@@ -40,6 +40,7 @@ def test_add_qualification(logged_in_browser, live_server, trainee, supervisor,
     page.item_selector.toggle()
 
     select_super(page, supervisor)
+    page.supervisor_selector.toggle()
 
     page.submit()
     assert page.success