Added tests for the automatic "find" functions
Slight re-formatting of the User model code