Fixing tests
Merge branch 'master' of https://github.com/davet1985/social-challenges