making CCM tests work