CB-8131 Corrects test modules names so they can be properly loaded by test framework