Bah. This test isn't good enough to shake up mis-ordering issues with such a small map it seems. The tests pass even without the patches in this PR :-(.