Push user-test

from progress made with my airpair from john davison
Merge branch 'add-user-model-tests'

"Push user-test progress

Made from my airpair with John Davison"