TestUtils and test improvements