Fixed failing mchs tests