Fix CSM tests