removed dead code
Completed unit test
Merge branch 'master' of github.com:akeneo/pim-community-dev