Fix a minor bug and some specs
Merge branch 'sign_up' into development