diff --git a/PyRIGS/settings.py b/PyRIGS/settings.py
index fc593be4..70d41064 100644
--- a/PyRIGS/settings.py
+++ b/PyRIGS/settings.py
@@ -26,8 +26,6 @@ DEBUG = bool(int(os.environ.get('DEBUG'))) if os.environ.get('DEBUG') else True
 
 STAGING = bool(int(os.environ.get('STAGING'))) if os.environ.get('STAGING') else False
 
-TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = ['pyrigs.nottinghamtec.co.uk', 'rigs.nottinghamtec.co.uk', 'pyrigs.herokuapp.com']
 
 if STAGING:
@@ -221,7 +219,8 @@ TEMPLATES = [
                 "django.template.context_processors.tz",
                 "django.template.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
-            ]
+            ],
+            'debug': DEBUG
         },
     },
 ]
diff --git a/RIGS/admin.py b/RIGS/admin.py
index 58b27e4c..49b8aa1e 100644
--- a/RIGS/admin.py
+++ b/RIGS/admin.py
@@ -95,8 +95,7 @@ class AssociateAdmin(VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context,
-                                    current_app=self.admin_site.name)
+            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context)
 
 
 @admin.register(models.Person)
diff --git a/RIGS/test_models.py b/RIGS/test_models.py
index b84fc7a6..1809c73b 100644
--- a/RIGS/test_models.py
+++ b/RIGS/test_models.py
@@ -275,14 +275,14 @@ class EventTestCase(TestCase):
             # basic checks
             manager.create(name='TE IB2', start_date='2016-01-02', end_date='2016-01-04'),
             manager.create(name='TE IB3', start_date='2015-12-31', end_date='2016-01-03'),
-            manager.create(name='TE IB4', start_date='2016-01-04', access_at='2016-01-03'),
-            manager.create(name='TE IB5', start_date='2016-01-04', meet_at='2016-01-02'),
+            manager.create(name='TE IB4', start_date='2016-01-04', access_at=self.create_datetime(2016, 01, 03, 00, 00)),
+            manager.create(name='TE IB5', start_date='2016-01-04', meet_at=self.create_datetime(2016, 01, 02, 00, 00)),
 
             # negative check
             manager.create(name='TE IB6', start_date='2015-12-31', end_date='2016-01-01'),
         ]
 
-        in_bounds = manager.events_in_bounds(datetime(2016, 1, 2), datetime(2016, 1, 3))
+        in_bounds = manager.events_in_bounds(self.create_datetime(2016, 1, 2, 0, 0), self.create_datetime(2016, 1, 3, 0, 0))
         self.assertIn(events[0], in_bounds)
         self.assertIn(events[1], in_bounds)
         self.assertIn(events[2], in_bounds)
diff --git a/RIGS/urls.py b/RIGS/urls.py
index f6b3fe14..30eb7051 100644
--- a/RIGS/urls.py
+++ b/RIGS/urls.py
@@ -9,16 +9,16 @@ from django.views.decorators.clickjacking import xframe_options_exempt
 from PyRIGS.decorators import permission_required_with_403
 from PyRIGS.decorators import api_key_required
 
-urlpatterns = patterns('',
+urlpatterns = [
                        # Examples:
                        # url(r'^$', 'PyRIGS.views.home', name='home'),
                        # url(r'^blog/', include('blog.urls')),
                        url('^$', login_required(views.Index.as_view()), name='index'),
                        url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'),
 
-                       url('^user/login/$', 'RIGS.views.login', name='login'),
+                       url('^user/login/$', views.login, name='login'),
                        url('^user/login/embed/$', xframe_options_exempt(views.login_embed), name='login_embed'),
-                       url(r'^user/password_reset/$', 'django.contrib.auth.views.password_reset', {'password_reset_form': forms.PasswordReset}),
+                       url(r'^user/password_reset/$', password_reset, {'password_reset_form': forms.PasswordReset}),
 
                        # People
                        url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
@@ -167,4 +167,4 @@ urlpatterns = patterns('',
                        url(r'^rig/show/(?P<pk>\d+)/$', RedirectView.as_view(permanent=True, pattern_name='event_detail')),
                        url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
                        url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-                       )
+                       ]