Merge "Remove duplicate logic from ModuleTestUtils"