PIM-1518 : fix unit tests
Merge branch 'master' of github.com:akeneo/pim-community-dev