Changes to fix public MMS tests

Magic time.sleep() is magic