Some cleanup for the unit tests (got rid of TestUtil)