Simple Test specs for the login
Fixed conflicsts