rename function in services
fix tests for multiuser scenarios
fix test name
fix pep8 warnings
fix test that didn't test the right thing