making tests work with CCM