some more output from the cm, and tweaking tests