Refactoring tests and fixing bad defautlLogin push