Adjustments to the retrieve method on the UserService, wrote a few UserService tests and a test to ensure abitrary properties cannot be set