Got a test to pass
Wrote some tests for the user model
Merge branch 'messing-around'