move tests and make sure cms has same test configuration