Bug 1020644 - MMS tests part one, post-review improvements