Merge pull request #128 from missingno15/bug/user_spec

Looked good to me
Updated location tests, added user test