CM fixed unit tests