Test cleanup
Merge pull request #2791 from davidegrohmann/2.1-test-cleanup

Test cleanup