added automatic zxy

I removed it really only for storage size (no idea if that actually matters) + keeping the test assertions as close as possible. Current master comes in without _geometry, so if we need it, I assume it is for something new.