Fixed failing tests.
Merge branch 'master' of https://github.com/partyks/enroll-me