Changes to fix public MMS tests