clean up tests and adds basic check for the login logic

clean up tests and adds basic check for the login logic #35327