Clean up
Fix test for login to work with command line arg reader