Fixing error message, adding tests
Merge branch 'sign-up'
Finish sign in