Fixing and adding test cases for the Geotools class

This should fix #764