Resolved conflict in login tests