factoryGirl tests fixed
Merge branch 'master' of https://github.com/a-plus-plus/aktivator