Updated tests
Merge pull request #1820 from sylvaindeloux/quickwin

Updated tests