Move test_service to the appropriate place
Whitespace fix
Significant improvements to password auth and tests