Add more tests for users
Clean up users code to get tests to pass