Fixing CAP-1522 for MMS test cases