MixedClassRewriter repair, One...TestScenario adjusted