split cms.tests.check into two classes