Making CCM tests work