Use annotation for geoindex and clean up testdata