Fixes tests and login