Small insignificant changes for the most part
Added unit tests for the UserService