Bug 1020644 - MMS webapi tests part one, post-review updates