Merge branch 'consumer-sprint27-bugid-95788' of github.com:Wikia/app into bugid-95788
small refactoring
broken unit test but should work according to phpunit.de
Revert "broken unit test but should work according to phpunit.de"

This reverts commit b0d262ec78c41f1c4431a5ef13a17a42b27f815b.
Merge branch 'consumer-sprint27-bugid-95788' of github.com:Wikia/app into bugid-95788