Some much needed cleanup in the TestUtil class
Merge pull request #597 from JeroenDeDauw/cleantestsetup

Some much needed cleanup in the TestUtil class