Fixing tests
Merge branch 'master' of github.com:giv2giv/api