A couple more tests, skipped CM tests for now