Refactor, add Sign Up tests