Remove some usage of TestUtils