Adding model new geometry tools and test suite