Refactored specs and sign in form