Fix nasty bug in match validation test

I wasn't generating matches correctly and so the tests were blowing up
pretty badly for everyone.  This should hopefully fix the issue.