Changed "tools" and "TestUtils" to be "utils" and "UTILS" for consistency.