Changes to fix public MMS tests

Same as above