Fix mass test breakage from pull request #19.

(Merge commit 7b826109920f806569c000397a8465966e16c8c2.)