tests simplification
Merge pull request #2660 from jerrinot/testImprovements

tests simplification