JAL-2609 tweaks to, and tests for, calculateWrappedGeometry