Started to work on making tests for the controllers, refactored test factories
Merge branch 'master' of github.com:andrewwwolfe/Alexandria