mscms: Branching fixes for some test routines