Merge "Remove dependency on ModuleTestUtils"