Some much needed cleanup in the TestUtil class