More tests; updated UserService and interface.