Merge branch 'feature/refactor-fixtures' of github.com:EcomDev/EcomDev_PHPUnit into feature/refactor-fixtures