Cleanup
Start of TestClient refactoring
Created UserService