Fixed some functional tests
Merge pull request #220 from sylvaindeloux/2.3-develop

Fixed some functional tests