Change matching approach because 1.8 hashes are unordered

...and thus a pain to test in a non-brittle way