TestUtils refactoring