Tightened geo tests and sort tests