63a824f9d9
* fixes bugs in tests * refactors and simplifies geometry merging on GeometryForm
* fixes bugs in tests * refactors and simplifies geometry merging on GeometryForm