Fixing ShapeFileTests failures