Refactor mmtest2 to sync with new libmm prototypes