Remove global rhumb thing and fix test reference