Minor testing cleanup
More cleanup
More cleanup
More testing cleanup
Minor cleanup
Merge pull request #1859 from pveentjer/testingcleanup2

Testingcleanup2