Improved code covage (branches) around cm handle state changes