fixed test
Merge pull request #1506 from naylor-b/geom_fixes

fixed geom test
Merge branch 'dev' into gui