Fixed unit tests
Merge pull request #345 from mremi/fix-unit-tests

Fixed unit tests
Fix #343
Fixed parent issue
Merge pull request #347 from sylvaindeloux/master

Fixed parent issue
Merge remote-tracking branch 'sonata-project/master'