Fixed tests
Merge pull request #228 from sylvaindeloux/2.3-develop

Fixed tests