Rename switch to USE_PRE22GEODESIC so it is more clear

Amend CUnit tests so both can be tested