Small adjustments for CMTest_TestCase