Fix and improve mon-data tests

In response to 1e521739cfb307cc39d2d2bce7cea9e8472d01af .