Remove more TestUtils classes