Minor fixes for MMS tests