tests fixed (adapted to changed wording)
Merge branch 'master' of https://github.com/mvandeloo/360life