Fixed tests that were broken by previous change to login code