Further fixes for MMS test cases