Changes to fix public MMS tests

Sure, I just didn't want to remove everything in one run :dancer: