Merge pull request #67 from mnjuhn/master

Geometry testing, tweaks and merging
Unit test failure