our first tests
stuff
Merge branch 'feature-users'