Order tests

Fixes to the order tests to use the resources in S2Mapper tests, and a handle a few extra edge cases that the S2Mapper data exposed