More cms test fixes