move mmm to client side services, changed testing to reflect that