Geo Tests
fixed merge