Refactor tests and sign up