Adding test script for geometry
Fixing some commit issues