diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 5ab9156c..4e86ff64 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -941,16 +941,18 @@ class IcalTest(LiveServerTestCase):
         response = c.get(icalUrl)
         self.assertEqual(200, response.status_code)
 
+        # content = response.content.decode('utf-8')
+
         # Check has entire file
-        self.assertIn("BEGIN:VCALENDAR", response.content)
-        self.assertIn("END:VCALENDAR", response.content)
+        self.assertContains(response, "BEGIN:VCALENDAR")
+        self.assertContains(response, "END:VCALENDAR")
 
         expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17]
         for test in range(1, 18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertContains(response, "TE E" + str(test) + " ")
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotContains(response, "TE E" + str(test) + " ")
 
         # Only dry hires
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -963,9 +965,9 @@ class IcalTest(LiveServerTestCase):
         expectedIn = [10, 11, 12, 13]
         for test in range(1, 18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertContains(response, "TE E" + str(test) + " ")
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotContains(response, "TE E" + str(test) + " ")
 
         # Only provisional rigs
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -979,9 +981,9 @@ class IcalTest(LiveServerTestCase):
         expectedIn = [1, 2]
         for test in range(1, 18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertContains(response, "TE E" + str(test) + " ")
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotContains(response, "TE E" + str(test) + " ")
 
         # Only cancelled non-rigs
         self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -996,9 +998,9 @@ class IcalTest(LiveServerTestCase):
         expectedIn = [18]
         for test in range(1, 18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertContains(response, "TE E" + str(test) + " ")
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotContains(response, "TE E" + str(test) + " ")
 
         # Nothing selected
         self.browser.find_element_by_xpath("//input[@value='non-rig']").click()
@@ -1011,9 +1013,9 @@ class IcalTest(LiveServerTestCase):
         expectedIn = []
         for test in range(1, 18):
             if test in expectedIn:
-                self.assertIn("TE E" + str(test) + " ", response.content)
+                self.assertContains(response, "TE E" + str(test) + " ")
             else:
-                self.assertNotIn("TE E" + str(test) + " ", response.content)
+                self.assertNotContains(response, "TE E" + str(test) + " ")
 
                 # Wow - that was a lot of tests