Check in latest MMS test cases and code fixes