More changes to mockma api
Merge branch 'master' of github.com:motech/perf