fixes for unit tests
Merge branch 'dev' of github.com:Wikia/app into dev