Fix for login
test fixes