test and fixtures for users
Merge remote-tracking branch 'origin/master'