Fix merged tests
Merge pull request #27 from atlasapi/fix-user-tests

Fix merged tests