Fix some tests

And some things that were actually borked

RIGS/admin.py

@@ -106,7 +106,7 @@ class AssociateAdmin(VersionAdmin):
                 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
                 'forms': forms
             }
-            return TemplateResponse(request, 'RIGS/admin_associate_merge.html', context)
+            return TemplateResponse(request, 'admin_associate_merge.html', context)
 
 
 @admin.register(models.Person)