Fixing MMS tests