ENH: Allow more flexibility with geometries
Changeup tests to reflect drop=False default