refactored client mmm tests to work with new service