Add grid-simp and clip-simp to the set of data output
Refactor the tester to only use mapnik subquery support