Tests and fixes

Jesse Tilrorequested to merge
tests-and-fixes into development

Wrote some initial test cases for admin controllers.

Merge request reports