Add Csm tests to overall tests