Further clean-up after removing failing mcrbm test