Finished off all the UserControllerTests and changed the UserTests to only be unit tests.
Updated the code to Java 7.