Add more stuff to TestUtils.java