Making ConsistencyTests work with CCM