More testing

- Working towards #1108
- Speeding up testing by 4 minutes. I am sorry it was my bad that they were running so slowly
- Testing the users controller through both functional and integration tests.