Most of the straightforward fixes to the Selector spec
Update specs to match new Selector API (involves extracting GeographyService)