Corrections and minor fixes to use new geometry spec; couple of new test cases