Om nom nom, bug fixes and tests for the user service