adds and tweaks user spec tests
WIP user spec tests
merges in user spec tests