You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2019/05/08 11:51:24 UTC

[jena] 03/08: - removed commented out System.out messages in Test packages.

This is an automated email from the ASF dual-hosted git repository.

andy pushed a commit to branch geosparql
in repository https://gitbox.apache.org/repos/asf/jena.git

commit 619693364f7c03c5aa0b61dbe59abac8f52a7ea7
Author: Greg Albiston <46...@users.noreply.github.com>
AuthorDate: Mon May 6 17:33:27 2019 +0100

    - removed commented out System.out messages in Test packages.
---
 .../configuration/GeoSPARQLOperationsTest.java     | 42 -------------
 .../jena/geosparql/configuration/ModeSRSTest.java  |  6 --
 .../GenericGeometryPropertyFunctionTest.java       | 12 ----
 .../topological/GenericPropertyFunctionTest.java   | 57 -----------------
 .../SpatialObjectGeometryLiteralTest.java          | 18 ------
 .../egenhofer/EhContainsPFTest.java                | 18 ------
 .../egenhofer/EhCoveredByPFTest.java               | 18 ------
 .../egenhofer/EhCoversPFTest.java                  | 12 ----
 .../egenhofer/EhDisjointPFTest.java                | 18 ------
 .../egenhofer/EhEqualsPFTest.java                  | 30 ---------
 .../egenhofer/EhInsidePFTest.java                  | 24 --------
 .../property_functions/egenhofer/EhMeetPFTest.java | 18 ------
 .../egenhofer/EhOverlapPFTest.java                 | 15 -----
 .../CoordinateDimensionPFTest.java                 | 12 ----
 .../geometry_property/DimensionPFTest.java         |  9 ---
 .../geometry_property/IsEmptyPFTest.java           |  6 --
 .../geometry_property/IsSimplePFTest.java          |  6 --
 .../geometry_property/IsValidPFTest.java           |  6 --
 .../geometry_property/SpatialDimensionPFTest.java  | 12 ----
 .../rcc8/RccDisconnectedPFTest.java                |  6 --
 .../property_functions/rcc8/RccEqualsPFTest.java   | 12 ----
 .../rcc8/RccExternallyConnectedPFTest.java         |  6 --
 .../RccNonTangentialProperPartInversePFTest.java   |  6 --
 .../rcc8/RccNonTangentialProperPartPFTest.java     |  6 --
 .../rcc8/RccPartiallyOverlappingPFTest.java        |  6 --
 .../rcc8/RccTangentialProperPartInversePFTest.java |  6 --
 .../rcc8/RccTangentialProperPartPFTest.java        |  6 --
 .../simple_features/SfContainsPFTest.java          | 18 ------
 .../simple_features/SfCrossesPFTest.java           | 24 --------
 .../simple_features/SfDisjointPFTest.java          | 18 ------
 .../simple_features/SfEqualsPFTest.java            | 30 ---------
 .../simple_features/SfIntersectsPFTest.java        | 18 ------
 .../simple_features/SfOverlapsPFTest.java          | 18 ------
 .../simple_features/SfTouchesPFTest.java           | 18 ------
 .../simple_features/SfWithinPFTest.java            | 18 ------
 .../filter_functions/BoundaryFFTest.java           |  6 --
 .../filter_functions/BufferFFTest.java             | 12 ----
 .../filter_functions/ConvexHullFFTest.java         |  6 --
 .../filter_functions/DifferenceFFTest.java         |  3 -
 .../filter_functions/DistanceFFTest.java           |  6 --
 .../filter_functions/EnvelopFFTest.java            |  9 ---
 .../filter_functions/GetSRIDFFTest.java            |  6 --
 .../filter_functions/IntersectionFFTest.java       |  9 ---
 .../SymmetricDifferenceFFTest.java                 |  3 -
 .../filter_functions/UnionFFTest.java              |  3 -
 .../egenhofer/EhContainsFFTest.java                | 51 ---------------
 .../egenhofer/EhCoveredByFFTest.java               | 51 ---------------
 .../filter_functions/egenhofer/EhCoversFFTest.java | 45 --------------
 .../egenhofer/EhDisjointFFTest.java                | 51 ---------------
 .../filter_functions/egenhofer/EhEqualsFFTest.java | 57 -----------------
 .../filter_functions/egenhofer/EhInsideFFTest.java | 57 -----------------
 .../filter_functions/egenhofer/EhMeetFFTest.java   | 51 ---------------
 .../egenhofer/EhOverlapFFTest.java                 | 48 ---------------
 .../CoordinateDimensionFFTest.java                 | 12 ----
 .../geometry_property/DimensionFFTest.java         |  9 ---
 .../geometry_property/IsEmptyFFTest.java           |  6 --
 .../geometry_property/IsSimpleFFTest.java          |  6 --
 .../geometry_property/IsValidFFTest.java           |  6 --
 .../geometry_property/SpatialDimensionFFTest.java  | 12 ----
 .../rcc8/RccDisconnectedFFTest.java                | 39 ------------
 .../filter_functions/rcc8/RccEqualsFFTest.java     | 39 ------------
 .../rcc8/RccExternallyConnectedFFTest.java         | 39 ------------
 .../rcc8/RccNonTangentialProperPartFFTest.java     | 39 ------------
 .../RccNonTangentialProperPartInverseFFTest.java   | 39 ------------
 .../rcc8/RccPartiallyOverlappingFFTest.java        | 39 ------------
 .../rcc8/RccTangentialProperPartFFTest.java        | 39 ------------
 .../rcc8/RccTangentialProperPartInverseFFTest.java | 39 ------------
 .../simple_features/SfContainsFFTest.java          | 51 ---------------
 .../simple_features/SfCrossesFFTest.java           | 57 -----------------
 .../simple_features/SfDisjointFFTest.java          | 51 ---------------
 .../simple_features/SfEqualsFFTest.java            | 57 -----------------
 .../simple_features/SfIntersectsFFTest.java        | 51 ---------------
 .../simple_features/SfOverlapsFFTest.java          | 51 ---------------
 .../simple_features/SfTouchesFFTest.java           | 51 ---------------
 .../simple_features/SfWithinFFTest.java            | 51 ---------------
 .../implementation/DimensionInfoTest.java          |  9 ---
 .../implementation/GeometryWrapperFactoryTest.java | 18 ------
 .../implementation/GeometryWrapperTest.java        | 72 ----------------------
 .../jena/geosparql/implementation/SRSInfoTest.java | 18 ------
 .../implementation/UnitsOfMeasureTest.java         | 39 ------------
 .../implementation/datatype/GMLDatatypeTest.java   |  3 -
 .../datatype/GeometryDatatypeTest.java             | 18 ------
 .../implementation/great_circle/AngleTest.java     | 12 ----
 .../implementation/great_circle/AzimuthTest.java   | 18 ------
 .../great_circle/CoordinatePairTest.java           | 33 ----------
 .../great_circle/GreatCircleDistanceTest.java      |  6 --
 .../great_circle/GreatCirclePointDistanceTest.java | 30 ---------
 .../jts/CoordinateSequenceDimensionsTest.java      | 15 -----
 .../implementation/registry/SRSRegistryTest.java   | 15 -----
 .../geosparql/spatial/ConvertLatLonBoxTest.java    | 12 ----
 .../jena/geosparql/spatial/ConvertLatLonTest.java  | 12 ----
 .../jena/geosparql/spatial/SearchEnvelopeTest.java | 69 ---------------------
 .../filter_functions/AngleDegreesFFTest.java       |  3 -
 .../spatial/filter_functions/AngleFFTest.java      |  3 -
 .../filter_functions/AzimuthDegreesFFTest.java     |  3 -
 .../spatial/filter_functions/AzimuthFFTest.java    |  3 -
 .../filter_functions/ConvertLatLonBoxFFTest.java   | 15 -----
 .../filter_functions/ConvertLatLonFFTest.java      |  9 ---
 .../spatial/filter_functions/DistanceFFTest.java   | 21 -------
 .../spatial/filter_functions/EqualsFFTest.java     | 57 -----------------
 .../filter_functions/GreatCircleFFTest.java        | 24 --------
 .../filter_functions/GreatCircleGeomFFTest.java    | 18 ------
 .../spatial/filter_functions/NearbyFFTest.java     | 39 ------------
 .../spatial/property_functions/EqualsPFTest.java   | 30 ---------
 .../GenericSpatialGeomPropertyFunctionTest.java    | 18 ------
 .../GenericSpatialPropertyFunctionTest.java        | 15 -----
 .../box/GenericSpatialBoxPropertyFunctionTest.java | 27 --------
 .../box/IntersectBoxGeomPFTest.java                |  9 ---
 .../property_functions/box/IntersectBoxPFTest.java |  9 ---
 .../box/WithinBoxGeomPFTest.java                   |  9 ---
 .../property_functions/box/WithinBoxPFTest.java    |  9 ---
 .../cardinal/EastGeomPFTest.java                   | 12 ----
 .../property_functions/cardinal/EastPFTest.java    | 12 ----
 .../GenericCardinalGeomPropertyFunctionTest.java   |  6 --
 .../GenericCardinalPropertyFunctionTest.java       | 21 -------
 .../cardinal/NorthGeomPFTest.java                  |  6 --
 .../property_functions/cardinal/NorthPFTest.java   |  6 --
 .../cardinal/SouthGeomPFTest.java                  |  6 --
 .../property_functions/cardinal/SouthPFTest.java   |  6 --
 .../cardinal/WestGeomPFTest.java                   | 12 ----
 .../property_functions/cardinal/WestPFTest.java    | 12 ----
 .../nearby/NearbyGeomPFTest.java                   | 39 ------------
 .../property_functions/nearby/NearbyPFTest.java    | 36 -----------
 123 files changed, 2706 deletions(-)

diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
index 465326e..68eeee7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperationsTest.java
@@ -124,9 +124,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
         Model instance = GeoSPARQLOperations.convert(inputModel);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -141,9 +138,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
         Model instance = GeoSPARQLOperations.convert(inputModel, outputSrsURI);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -158,9 +152,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATA);
         Model instance = GeoSPARQLOperations.convert(inputModel, outputDatatype);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -176,9 +167,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATATYPE_DATA);
         Model instance = GeoSPARQLOperations.convert(inputModel, outputSrsURI, outputDatatype);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -192,9 +180,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
         Dataset instance = GeoSPARQLOperations.convert(dataset);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -209,9 +194,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
         Dataset instance = GeoSPARQLOperations.convert(dataset, outputSrsURI);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -226,9 +208,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_DATATYPE_DATASET);
         Dataset instance = GeoSPARQLOperations.convert(dataset, outputDatatype);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -244,9 +223,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATATYPE_DATASET);
         Dataset instance = GeoSPARQLOperations.convert(inputDataset, outputSrsURI, outputDatatype);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -261,9 +237,6 @@ public class GeoSPARQLOperationsTest {
         GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
         List<String> expResult = Arrays.asList("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(1 0)", "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(3 2)");
         List<String> result = GeoSPARQLOperations.convertGeometryLiterals(geometryLiterals, outputSrsURI, outputDatatype);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -278,9 +251,6 @@ public class GeoSPARQLOperationsTest {
         GeometryDatatype outputDatatype = WKTDatatype.INSTANCE;
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(1 0)";
         String result = GeoSPARQLOperations.convertGeometryLiteral(geometryLiteral, outputSrsURI, outputDatatype);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -295,9 +265,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATASET);
         Dataset instance = GeoSPARQLOperations.convertGeoPredicates(dataset, isRemoveGeoPredicate);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -312,9 +279,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(CONVERTED_SRS_DATA);
         Model instance = GeoSPARQLOperations.convertGeoPredicates(model, isRemoveGeoPredicates);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -329,9 +293,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(GEO_ALL_DATASET);
         Dataset instance = GeoSPARQLOperations.convertGeoPredicates(dataset, isRemoveGeoPredicate);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -346,9 +307,6 @@ public class GeoSPARQLOperationsTest {
         TreeSet<String> expResult = extract(GEO_ALL_DATA);
         Model instance = GeoSPARQLOperations.convertGeoPredicates(model, isRemoveGeoPredicates);
         TreeSet<String> result = extract(instance);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
index 7cebbe3..a986cfe 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/configuration/ModeSRSTest.java
@@ -85,9 +85,6 @@ public class ModeSRSTest {
         expResult.add(new SimpleEntry<>("http://www.opengis.net/def/crs/EPSG/0/27700", 1));
 
         List<Entry<String, Integer>> result = instance.getSrsList();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +98,6 @@ public class ModeSRSTest {
         instance.search(MODEL);
         String expResult = "http://www.opengis.net/def/crs/OGC/1.3/CRS84";
         String result = instance.getModeURI();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
index 531462b..47a9ac2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericGeometryPropertyFunctionTest.java
@@ -83,9 +83,6 @@ public class GenericGeometryPropertyFunctionTest {
         GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
         Node expResult = NodeFactory.createLiteral("2", XSDDatatype.XSDinteger);
         Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +100,6 @@ public class GenericGeometryPropertyFunctionTest {
         GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
         Node expResult = null;
         Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -123,9 +117,6 @@ public class GenericGeometryPropertyFunctionTest {
         GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
         Node expResult = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger);
         Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -143,9 +134,6 @@ public class GenericGeometryPropertyFunctionTest {
         GenericGeometryPropertyFunction instance = new CoordinateDimensionPF();
         Node expResult = NodeFactory.createLiteral("3", XSDDatatype.XSDinteger);
         Node result = instance.getGeometryLiteral(subject, predicate, graph);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
index 950f22b..e312047 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/GenericPropertyFunctionTest.java
@@ -103,9 +103,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -123,9 +120,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -143,9 +137,6 @@ public class GenericPropertyFunctionTest {
         Node node = NodeFactory.createBlankNode(id);
 
         Boolean result = graph.contains(node, RDF.type.asNode(), Geo.GEOMETRY_NODE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,8 +157,6 @@ public class GenericPropertyFunctionTest {
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
 
         GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -185,9 +174,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -205,9 +191,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -225,9 +208,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -248,8 +228,6 @@ public class GenericPropertyFunctionTest {
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
 
         GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +245,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = false;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -287,9 +262,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = false;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -307,9 +279,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = false;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -327,9 +296,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = false;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -348,9 +314,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -371,8 +334,6 @@ public class GenericPropertyFunctionTest {
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
 
         GeoSPARQLConfig.setup(IndexOption.MEMORY, Boolean.TRUE);
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -390,9 +351,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = true;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -410,9 +368,6 @@ public class GenericPropertyFunctionTest {
         QueryRewriteIndex queryRewriteIndex = QueryRewriteIndex.createDefault();
         Boolean expResult = false;
         Boolean result = instance.queryRewrite(graph, subject, predicate, object, queryRewriteIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -447,9 +402,6 @@ public class GenericPropertyFunctionTest {
         //Blank nodes limit a value check.
         boolean expResult = true;
         boolean result = subjects.size() == 25 && objects.size() == 25;
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //System.out.println("Subjects: " + subjects);
         //System.out.println("Objects: " + objects);
         assertEquals(expResult, result);
@@ -484,9 +436,6 @@ public class GenericPropertyFunctionTest {
         //Blank nodes limit a value check.
         int expResult = 6;
         int result = objects.size();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //System.out.println("Objects: " + objects);
         assertEquals(expResult, result);
     }
@@ -594,9 +543,6 @@ public class GenericPropertyFunctionTest {
         List<Resource> expSubjects = Arrays.asList(FEATURE_A);
         List<Resource> expObjects = Arrays.asList(FEATURE_B);
         boolean result = subjects.equals(expSubjects) && objects.equals(expObjects);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -634,9 +580,6 @@ public class GenericPropertyFunctionTest {
         List<Resource> expSubjects = Arrays.asList(GEO_FEATURE_Y);
         List<Resource> expObjects = Arrays.asList(GEO_FEATURE_Z);
         boolean result = subjects.equals(expSubjects) && objects.equals(expObjects);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
index 821cdaa..9ff149e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/SpatialObjectGeometryLiteralTest.java
@@ -75,9 +75,6 @@ public class SpatialObjectGeometryLiteralTest {
 
         boolean expResult = false;
         boolean result = instance.isValid();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -92,9 +89,6 @@ public class SpatialObjectGeometryLiteralTest {
         Resource targetSpatialObject = GEOMETRY_B;
         SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(GEOMETRY_B.asNode(), LITERAL_B.asNode());
         SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(graph, targetSpatialObject.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -108,9 +102,6 @@ public class SpatialObjectGeometryLiteralTest {
         Resource targetSpatialObject = FEATURE_B;
         SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(FEATURE_B.asNode(), LITERAL_B.asNode());
         SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(MODEL.getGraph(), targetSpatialObject.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -127,9 +118,6 @@ public class SpatialObjectGeometryLiteralTest {
 
         boolean expResult = false;
         boolean result = instance.isValid();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -146,9 +134,6 @@ public class SpatialObjectGeometryLiteralTest {
 
         boolean expResult = false;
         boolean result = instance.isValid();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -162,9 +147,6 @@ public class SpatialObjectGeometryLiteralTest {
         Resource targetSpatialObject = GEO_FEATURE_Y;
         SpatialObjectGeometryLiteral expResult = new SpatialObjectGeometryLiteral(GEO_FEATURE_Y.asNode(), GEO_FEATURE_LITERAL.asNode());
         SpatialObjectGeometryLiteral result = SpatialObjectGeometryLiteral.retrieve(MODEL.getGraph(), targetSpatialObject.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
index b9896b2..f76cb37 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhContainsPFTest.java
@@ -63,9 +63,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class EhContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
index d51a2c2..4f19c51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoveredByPFTest.java
@@ -65,9 +65,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +107,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class EhCoveredByPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
index 92b44a3..7a6036e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhCoversPFTest.java
@@ -65,9 +65,6 @@ public class EhCoversPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class EhCoversPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class EhCoversPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +107,6 @@ public class EhCoversPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
index 51265b5..b59e95e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhDisjointPFTest.java
@@ -63,9 +63,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class EhDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
index 0c3fba2..36c2a11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhEqualsPFTest.java
@@ -64,9 +64,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -98,9 +92,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -203,9 +179,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -223,9 +196,6 @@ public class EhEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
index e9ec8b8..ca97a40 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhInsidePFTest.java
@@ -65,9 +65,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +107,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class EhInsidePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
index 22a6edb..bbfc469 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhMeetPFTest.java
@@ -65,9 +65,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +107,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class EhMeetPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
index f521ea1..74aa2d6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/egenhofer/EhOverlapPFTest.java
@@ -68,9 +68,6 @@ public class EhOverlapPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class EhOverlapPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -102,9 +96,6 @@ public class EhOverlapPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -119,9 +110,6 @@ public class EhOverlapPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -136,9 +124,6 @@ public class EhOverlapPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
index 860df27..a2ed96d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/CoordinateDimensionPFTest.java
@@ -62,9 +62,6 @@ public class CoordinateDimensionPFTest {
         CoordinateDimensionPF instance = new CoordinateDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class CoordinateDimensionPFTest {
         CoordinateDimensionPF instance = new CoordinateDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -94,9 +88,6 @@ public class CoordinateDimensionPFTest {
         CoordinateDimensionPF instance = new CoordinateDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -110,9 +101,6 @@ public class CoordinateDimensionPFTest {
         CoordinateDimensionPF instance = new CoordinateDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(4);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
index 24fbbba..0b15ae2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/DimensionPFTest.java
@@ -62,9 +62,6 @@ public class DimensionPFTest {
         DimensionPF instance = new DimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(0);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class DimensionPFTest {
         DimensionPF instance = new DimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(1);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -94,9 +88,6 @@ public class DimensionPFTest {
         DimensionPF instance = new DimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
index d5f24e8..efd91ff 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsEmptyPFTest.java
@@ -62,9 +62,6 @@ public class IsEmptyPFTest {
         IsEmptyPF instance = new IsEmptyPF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class IsEmptyPFTest {
         IsEmptyPF instance = new IsEmptyPF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
index 74f2dd7..611627c 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsSimplePFTest.java
@@ -62,9 +62,6 @@ public class IsSimplePFTest {
         IsSimplePF instance = new IsSimplePF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class IsSimplePFTest {
         IsSimplePF instance = new IsSimplePF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
index a4395d4..6305902 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/IsValidPFTest.java
@@ -62,9 +62,6 @@ public class IsValidPFTest {
         IsValidPF instance = new IsValidPF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class IsValidPFTest {
         IsValidPF instance = new IsValidPF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
index f4e3a19..06a40e4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/geometry_property/SpatialDimensionPFTest.java
@@ -62,9 +62,6 @@ public class SpatialDimensionPFTest {
         SpatialDimensionPF instance = new SpatialDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class SpatialDimensionPFTest {
         SpatialDimensionPF instance = new SpatialDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -94,9 +88,6 @@ public class SpatialDimensionPFTest {
         SpatialDimensionPF instance = new SpatialDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -110,9 +101,6 @@ public class SpatialDimensionPFTest {
         SpatialDimensionPF instance = new SpatialDimensionPF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.applyPredicate(geometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
index 4d1d390..356baa5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccDisconnectedPFTest.java
@@ -64,9 +64,6 @@ public class RccDisconnectedPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class RccDisconnectedPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
index 72318d0..a58a2b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccEqualsPFTest.java
@@ -65,9 +65,6 @@ public class RccEqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class RccEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -102,9 +96,6 @@ public class RccEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -122,9 +113,6 @@ public class RccEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
index 9759c26..1d36830 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccExternallyConnectedPFTest.java
@@ -63,9 +63,6 @@ public class RccExternallyConnectedPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class RccExternallyConnectedPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
index e7dda11..2b47c77 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartInversePFTest.java
@@ -63,9 +63,6 @@ public class RccNonTangentialProperPartInversePFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class RccNonTangentialProperPartInversePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
index 1be6f78..272cb11 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccNonTangentialProperPartPFTest.java
@@ -63,9 +63,6 @@ public class RccNonTangentialProperPartPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class RccNonTangentialProperPartPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
index 07cc3b9..d4928d8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccPartiallyOverlappingPFTest.java
@@ -63,9 +63,6 @@ public class RccPartiallyOverlappingPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class RccPartiallyOverlappingPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
index 1f7a359..f3ed862 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartInversePFTest.java
@@ -64,9 +64,6 @@ public class RccTangentialProperPartInversePFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class RccTangentialProperPartInversePFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
index a8c1742..e62a10f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/rcc8/RccTangentialProperPartPFTest.java
@@ -64,9 +64,6 @@ public class RccTangentialProperPartPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class RccTangentialProperPartPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
index 913a6bd..81571ea 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfContainsPFTest.java
@@ -63,9 +63,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class SfContainsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
index 475483f..3f8a240 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfCrossesPFTest.java
@@ -67,9 +67,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -102,9 +96,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -119,9 +110,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -136,9 +124,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -153,9 +138,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -170,9 +152,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +166,6 @@ public class SfCrossesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
index c774f01..78b9e39 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfDisjointPFTest.java
@@ -63,9 +63,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class SfDisjointPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
index ba4b73e..eb936b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfEqualsPFTest.java
@@ -64,9 +64,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -98,9 +92,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -203,9 +179,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -223,9 +196,6 @@ public class SfEqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
index 1f42ca7..c6ddfc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfIntersectsPFTest.java
@@ -63,9 +63,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class SfIntersectsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
index 3a997b5..db4e642 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfOverlapsPFTest.java
@@ -65,9 +65,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -82,9 +79,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +107,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class SfOverlapsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
index c24e33d..19de489 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfTouchesPFTest.java
@@ -64,9 +64,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -98,9 +92,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class SfTouchesPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
index ac6fa77..e03aad6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geo/topological/property_functions/simple_features/SfWithinPFTest.java
@@ -63,9 +63,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class SfWithinPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
index 0cbbe54..76e4224 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BoundaryFFTest.java
@@ -62,9 +62,6 @@ public class BoundaryFFTest {
         BoundaryFF instance = new BoundaryFF();
         NodeValue expResult = NodeValue.makeNode("LINESTRING(30 40, 30 70, 90 70, 90 40, 30 40)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -79,9 +76,6 @@ public class BoundaryFFTest {
         BoundaryFF instance = new BoundaryFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> LINESTRING(30 40, 30 70, 90 70, 90 40, 30 40)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
index 05d569a..a7de18b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/BufferFFTest.java
@@ -71,9 +71,6 @@ public class BufferFFTest {
         BufferFF instance = new BufferFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((80 60, 79.61570560806462 56.09819355967743, 78.47759065022574 52.3463313526982, 76.62939224605091 48.88859533960796, 74.14213562373095 45.85786437626905, 71.11140466039204 43.370607753949095, 67.6536686473018 41.522409349774264, 63.90180644032257 40.38429439193539, 60 40, 56.09819355967743 40.38429439193539, 52.34633135269821 41.522409349774264, 48.88859533960796 43.370607753949095, 4 [...]
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -89,9 +86,6 @@ public class BufferFFTest {
         BufferFF instance = new BufferFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((74.39204761973815 58.93046388030052, 73.7935792641947 54.61624912638217, 72.66504878236447 50.508902633562684, 71.04982384038158 46.76626767590642, 69.00997585331788 43.53217199537903, 66.62389473285293 40.930900496430695, 63.98327645310201 39.062419002875686, 61.18959919176996 37.9985325448215, 58.35022347670747 37.78012590389699, 55.57426621468039 38.41559237986803, 52.9684071949450 [...]
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +101,6 @@ public class BufferFFTest {
         BufferFF instance = new BufferFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.899820141481335 -7.499999814065095, 49.89982357682339 -7.50005416286721, 49.89983379760518 -7.500106428518575, 49.899850410726465 -7.5001546008335165, 49.8998727772313 -7.500196827054945, 49.899900036882244 -7.500231483111882, 49.89993114124498 -7.500257236082699, 49.89996489401149 -7.5002730954617265, 49.89999999701054 -7.500278451257391, 50.00000000229664 -7.500279028565501, 50.00 [...]
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +174,6 @@ public class BufferFFTest {
         BufferFF instance = new BufferFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((49.8998 -7.5, 49.89980384294392 -7.500039018064403, 49.899815224093494 -7.500076536686473, 49.89983370607754 -7.500111114046604, 49.89985857864376 -7.500141421356237, 49.899888885953395 -7.500166293922461, 49.89992346331353 -7.500184775906503, 49.89996098193559 -7.500196157056081, 49.9 -7.5002, 50 -7.5002, 50.000039018064406 -7.500196157056081, 50.00007653668647 -7.500184775906503, 50. [...]
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
index 03c6253..3355eaa 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/ConvexHullFFTest.java
@@ -61,9 +61,6 @@ public class ConvexHullFFTest {
         ConvexHullFF instance = new ConvexHullFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 5, 10 10, 0 0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class ConvexHullFFTest {
         ConvexHullFF instance = new ConvexHullFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(0 0, 10 10)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
index 7bbf340..feffe37 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DifferenceFFTest.java
@@ -62,9 +62,6 @@ public class DifferenceFFTest {
         DifferenceFF instance = new DifferenceFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((140 15, 140 45, 200 45, 200 15, 140 15), (145 30, 160 30, 160 40, 145 40, 145 30))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
index d929668..1f470bb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/DistanceFFTest.java
@@ -65,9 +65,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 30;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0);
     }
 
@@ -83,9 +80,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 7.2822E-6;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
index e47bc51..b48b1e3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/EnvelopFFTest.java
@@ -61,9 +61,6 @@ public class EnvelopFFTest {
         EnvelopFF instance = new EnvelopFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(10 10)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class EnvelopFFTest {
         EnvelopFF instance = new EnvelopFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -93,9 +87,6 @@ public class EnvelopFFTest {
         EnvelopFF instance = new EnvelopFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
index 5c811c0..ddea7cc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/GetSRIDFFTest.java
@@ -62,9 +62,6 @@ public class GetSRIDFFTest {
         GetSRIDFF instance = new GetSRIDFF();
         NodeValue expResult = NodeValue.makeString("http://www.opengis.net/def/crs/EPSG/0/27700");
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -78,9 +75,6 @@ public class GetSRIDFFTest {
         GetSRIDFF instance = new GetSRIDFF();
         NodeValue expResult = NodeValue.makeString(SRS_URI.DEFAULT_WKT_CRS84);
         NodeValue result = instance.exec(v);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
index 0d13327..d53b14a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/IntersectionFFTest.java
@@ -62,9 +62,6 @@ public class IntersectionFFTest {
         IntersectionFF instance = new IntersectionFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POINT(30 70)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -79,9 +76,6 @@ public class IntersectionFFTest {
         IntersectionFF instance = new IntersectionFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING(80 70, 80 40)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -96,9 +90,6 @@ public class IntersectionFFTest {
         IntersectionFF instance = new IntersectionFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> LINESTRING EMPTY", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
index 4ffd552..e996362 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/SymmetricDifferenceFFTest.java
@@ -62,9 +62,6 @@ public class SymmetricDifferenceFFTest {
         SymmetricDifferenceFF instance = new SymmetricDifferenceFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> MULTIPOLYGON(((30 40, 30 70, 90 70, 90 45, 80 45, 80 40, 30 40)), ((80 40, 90 40, 90 45, 140 45, 140 15, 80 15, 80 40)))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
index 07bfd89..2955049 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/nontopological/filter_functions/UnionFFTest.java
@@ -62,9 +62,6 @@ public class UnionFFTest {
         UnionFF instance = new UnionFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/27700> POLYGON((30 40, 30 70, 90 70, 90 45, 140 45, 140 15, 80 15, 80 40, 30 40))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
index 9788609..98efdb1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhContainsFFTest.java
@@ -67,9 +67,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class EhContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class EhContainsFFTest {
         EhContainsFF instance = new EhContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
index f00dfbd..eec1e8e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoveredByFFTest.java
@@ -69,9 +69,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -86,9 +83,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +111,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -137,9 +125,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -154,9 +139,6 @@ public class EhCoveredByFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -218,9 +191,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -252,9 +219,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -269,9 +233,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -286,9 +247,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -303,9 +261,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -320,9 +275,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -337,9 +289,6 @@ public class EhCoveredByFFTest {
         EhCoveredByFF instance = new EhCoveredByFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
index 7b9d603..2cbcd8d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhCoversFFTest.java
@@ -69,9 +69,6 @@ public class EhCoversFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -86,9 +83,6 @@ public class EhCoversFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class EhCoversFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +111,6 @@ public class EhCoversFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -218,9 +191,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -252,9 +219,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -269,9 +233,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -286,9 +247,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -303,9 +261,6 @@ public class EhCoversFFTest {
         EhCoversFF instance = new EhCoversFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
index 3da2b6c..004fe96 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhDisjointFFTest.java
@@ -67,9 +67,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class EhDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class EhDisjointFFTest {
         EhDisjointFF instance = new EhDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
index c8b9dc8..abc0220 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhEqualsFFTest.java
@@ -67,9 +67,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -186,9 +165,6 @@ public class EhEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -352,9 +301,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -369,9 +315,6 @@ public class EhEqualsFFTest {
         EhEqualsFF instance = new EhEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
index c7d99ce..bb7271b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhInsideFFTest.java
@@ -69,9 +69,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -86,9 +83,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +111,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -137,9 +125,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -154,9 +139,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -171,9 +153,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -188,9 +167,6 @@ public class EhInsideFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -203,9 +179,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -218,9 +191,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -252,9 +219,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -269,9 +233,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -286,9 +247,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -303,9 +261,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -320,9 +275,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -337,9 +289,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -354,9 +303,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -371,9 +317,6 @@ public class EhInsideFFTest {
         EhInsideFF instance = new EhInsideFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
index fbac108..c7cfa65 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhMeetFFTest.java
@@ -69,9 +69,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -86,9 +83,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +111,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -137,9 +125,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -154,9 +139,6 @@ public class EhMeetFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -218,9 +191,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -252,9 +219,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -269,9 +233,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -286,9 +247,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -303,9 +261,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -320,9 +275,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -337,9 +289,6 @@ public class EhMeetFFTest {
         EhMeetFF instance = new EhMeetFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
index ba66971..9649842 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/egenhofer/EhOverlapFFTest.java
@@ -72,9 +72,6 @@ public class EhOverlapFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -89,9 +86,6 @@ public class EhOverlapFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -106,9 +100,6 @@ public class EhOverlapFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -123,9 +114,6 @@ public class EhOverlapFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -140,9 +128,6 @@ public class EhOverlapFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -155,9 +140,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -170,9 +152,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +166,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -204,9 +180,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -221,9 +194,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -238,9 +208,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -255,9 +222,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -272,9 +236,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -289,9 +250,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -306,9 +264,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -323,9 +278,6 @@ public class EhOverlapFFTest {
         EhOverlapFF instance = new EhOverlapFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
index f9c9a09..c58d2a1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/CoordinateDimensionFFTest.java
@@ -61,9 +61,6 @@ public class CoordinateDimensionFFTest {
         CoordinateDimensionFF instance = new CoordinateDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class CoordinateDimensionFFTest {
         CoordinateDimensionFF instance = new CoordinateDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -93,9 +87,6 @@ public class CoordinateDimensionFFTest {
         CoordinateDimensionFF instance = new CoordinateDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -109,9 +100,6 @@ public class CoordinateDimensionFFTest {
         CoordinateDimensionFF instance = new CoordinateDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(4);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
index 4dd6f94..d94b866 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/DimensionFFTest.java
@@ -61,9 +61,6 @@ public class DimensionFFTest {
         DimensionFF instance = new DimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(0);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class DimensionFFTest {
         DimensionFF instance = new DimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(1);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -93,9 +87,6 @@ public class DimensionFFTest {
         DimensionFF instance = new DimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
index e57a366..500b386 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsEmptyFFTest.java
@@ -61,9 +61,6 @@ public class IsEmptyFFTest {
         IsEmptyFF instance = new IsEmptyFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class IsEmptyFFTest {
         IsEmptyFF instance = new IsEmptyFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
index d45768b..b2a9012 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsSimpleFFTest.java
@@ -61,9 +61,6 @@ public class IsSimpleFFTest {
         IsSimpleFF instance = new IsSimpleFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class IsSimpleFFTest {
         IsSimpleFF instance = new IsSimpleFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
index 8be38a8..a625712 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/IsValidFFTest.java
@@ -61,9 +61,6 @@ public class IsValidFFTest {
         IsValidFF instance = new IsValidFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(true);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class IsValidFFTest {
         IsValidFF instance = new IsValidFF();
         NodeValue expResult = NodeValue.makeNodeBoolean(false);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
index 32105bd..ac6393b 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/geometry_property/SpatialDimensionFFTest.java
@@ -61,9 +61,6 @@ public class SpatialDimensionFFTest {
         SpatialDimensionFF instance = new SpatialDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class SpatialDimensionFFTest {
         SpatialDimensionFF instance = new SpatialDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -93,9 +87,6 @@ public class SpatialDimensionFFTest {
         SpatialDimensionFF instance = new SpatialDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(2);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -109,9 +100,6 @@ public class SpatialDimensionFFTest {
         SpatialDimensionFF instance = new SpatialDimensionFF();
         NodeValue expResult = NodeValue.makeNodeInteger(3);
         NodeValue result = instance.exec(geometryLiteral);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
index b3d3a3d..ef30593 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccDisconnectedFFTest.java
@@ -68,9 +68,6 @@ public class RccDisconnectedFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class RccDisconnectedFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -100,9 +94,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = true;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = true;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -200,9 +176,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -217,9 +190,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -234,9 +204,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -251,9 +218,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -268,9 +232,6 @@ public class RccDisconnectedFFTest {
         RccDisconnectedFF instance = new RccDisconnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
index bd1772f..37bafb1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccEqualsFFTest.java
@@ -68,9 +68,6 @@ public class RccEqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class RccEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -100,9 +94,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -200,9 +176,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -217,9 +190,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -234,9 +204,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -251,9 +218,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -268,9 +232,6 @@ public class RccEqualsFFTest {
         RccEqualsFF instance = new RccEqualsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
index b7bdcc1..5d451d2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccExternallyConnectedFFTest.java
@@ -67,9 +67,6 @@ public class RccExternallyConnectedFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class RccExternallyConnectedFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -165,9 +147,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class RccExternallyConnectedFFTest {
         RccExternallyConnectedFF instance = new RccExternallyConnectedFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
index 8b6101c..6283a23 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartFFTest.java
@@ -67,9 +67,6 @@ public class RccNonTangentialProperPartFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class RccNonTangentialProperPartFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -165,9 +147,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class RccNonTangentialProperPartFFTest {
         RccNonTangentialProperPartFF instance = new RccNonTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
index a93fc9b..da8875a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccNonTangentialProperPartInverseFFTest.java
@@ -67,9 +67,6 @@ public class RccNonTangentialProperPartInverseFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class RccNonTangentialProperPartInverseFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -151,9 +136,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +166,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -205,9 +181,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -223,9 +196,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -241,9 +211,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -259,9 +226,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -277,9 +241,6 @@ public class RccNonTangentialProperPartInverseFFTest {
         RccNonTangentialProperPartInverseFF instance = new RccNonTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
index 5e724f3..9e6bd0e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccPartiallyOverlappingFFTest.java
@@ -67,9 +67,6 @@ public class RccPartiallyOverlappingFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class RccPartiallyOverlappingFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -99,9 +93,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -165,9 +147,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class RccPartiallyOverlappingFFTest {
         RccPartiallyOverlappingFF instance = new RccPartiallyOverlappingFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
index 802afc9..64f602f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartFFTest.java
@@ -68,9 +68,6 @@ public class RccTangentialProperPartFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class RccTangentialProperPartFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -100,9 +94,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -200,9 +176,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -217,9 +190,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -234,9 +204,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -251,9 +218,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -268,9 +232,6 @@ public class RccTangentialProperPartFFTest {
         RccTangentialProperPartFF instance = new RccTangentialProperPartFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
index 191c585..0b45d81 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/rcc8/RccTangentialProperPartInverseFFTest.java
@@ -68,9 +68,6 @@ public class RccTangentialProperPartInverseFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class RccTangentialProperPartInverseFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -100,9 +94,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -133,9 +121,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -151,9 +136,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +166,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -205,9 +181,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -223,9 +196,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -241,9 +211,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -259,9 +226,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -277,9 +241,6 @@ public class RccTangentialProperPartInverseFFTest {
         RccTangentialProperPartInverseFF instance = new RccTangentialProperPartInverseFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
index 9f0860f..dac6b08 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfContainsFFTest.java
@@ -67,9 +67,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class SfContainsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class SfContainsFFTest {
         SfContainsFF instance = new SfContainsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
index 4099503..2cd27ee 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfCrossesFFTest.java
@@ -71,9 +71,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -89,9 +86,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -106,9 +100,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -123,9 +114,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -140,9 +128,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -157,9 +142,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -174,9 +156,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -191,9 +170,6 @@ public class SfCrossesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -206,9 +182,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -221,9 +194,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -238,9 +208,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -255,9 +222,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -272,9 +236,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -289,9 +250,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -306,9 +264,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -323,9 +278,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -340,9 +292,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -357,9 +306,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -374,9 +320,6 @@ public class SfCrossesFFTest {
         SfCrossesFF instance = new SfCrossesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
index 9eb3e35..b70e9cf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfDisjointFFTest.java
@@ -67,9 +67,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class SfDisjointFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class SfDisjointFFTest {
         SfDisjointFF instance = new SfDisjointFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
index cdc34c2..a7c4e22 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfEqualsFFTest.java
@@ -67,9 +67,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false; //The boundary of a point is empty. Therefore, the boundary intersection of two points would also be empty.
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -186,9 +165,6 @@ public class SfEqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -352,9 +301,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -369,9 +315,6 @@ public class SfEqualsFFTest {
         SfEqualsFF instance = new SfEqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
index 9c10ef3..b8b9fb6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfIntersectsFFTest.java
@@ -67,9 +67,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class SfIntersectsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class SfIntersectsFFTest {
         SfIntersectsFF instance = new SfIntersectsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
index d25ee9a..b5f42bf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfOverlapsFFTest.java
@@ -69,9 +69,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -86,9 +83,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +111,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -137,9 +125,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -154,9 +139,6 @@ public class SfOverlapsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -218,9 +191,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -252,9 +219,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -269,9 +233,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -286,9 +247,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -303,9 +261,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -320,9 +275,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -337,9 +289,6 @@ public class SfOverlapsFFTest {
         SfOverlapsFF instance = new SfOverlapsFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
index 5947918..edf3be3 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfTouchesFFTest.java
@@ -68,9 +68,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -102,9 +96,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -119,9 +110,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -136,9 +124,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -153,9 +138,6 @@ public class SfTouchesFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -168,9 +150,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -200,9 +176,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = false;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -217,9 +190,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -234,9 +204,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -251,9 +218,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -268,9 +232,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -285,9 +246,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -302,9 +260,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -319,9 +274,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -336,9 +288,6 @@ public class SfTouchesFFTest {
         SfTouchesFF instance = new SfTouchesFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
index 1e11014..3b47abc 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/geof/topological/filter_functions/simple_features/SfWithinFFTest.java
@@ -67,9 +67,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class SfWithinFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -167,9 +149,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +161,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -199,9 +175,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class SfWithinFFTest {
         SfWithinFF instance = new SfWithinFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
index 5967e10..09d3fee 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/DimensionInfoTest.java
@@ -67,9 +67,6 @@ public class DimensionInfoTest {
         Geometry geometry = factory.createPoint(coordinate);
         DimensionInfo expResult = DimensionInfo.XY_POINT;
         DimensionInfo result = DimensionInfo.find(coordinate, geometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class DimensionInfoTest {
         Geometry geometry = factory.createLineString(coordinates.toArray(new Coordinate[coordinates.size()]));
         DimensionInfo expResult = DimensionInfo.XY_LINESTRING;
         DimensionInfo result = DimensionInfo.find(coordinates, geometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -102,9 +96,6 @@ public class DimensionInfoTest {
         Geometry geometry = factory.createMultiPoint(points.toArray(new Point[points.size()]));
         DimensionInfo expResult = DimensionInfo.XY_POINT;
         DimensionInfo result = DimensionInfo.findCollection(points, geometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
index eec9c07..04fdcaf 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperFactoryTest.java
@@ -68,9 +68,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(2 1)";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -88,9 +85,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "POINT(1 2)";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -108,9 +102,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> LINESTRING(2 1, 20 10)";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -128,9 +119,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "LINESTRING(1 2, 10 20)";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +136,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((2 1, 2 10, 20 10, 20 1, 2 1))";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -168,9 +153,6 @@ public class GeometryWrapperFactoryTest {
 
         String expResult = "POLYGON((1 2, 10 2, 10 20, 1 20, 1 2))";
         String result = instance.asLiteral().getLexicalForm();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
index 92d2655..7f4c853 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/GeometryWrapperTest.java
@@ -87,9 +87,6 @@ public class GeometryWrapperTest {
         Geometry geometryTarget = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
         GeometryWrapper expResult = new GeometryWrapper(geometryTarget, targetSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
         GeometryWrapper result = instance.checkTransformSRS(sourceSRSGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +104,6 @@ public class GeometryWrapperTest {
 
         CoordinateReferenceSystem expResult = CRS.forCode(sourceSRSURI);
         CoordinateReferenceSystem result = instance.getCRS();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -126,9 +120,6 @@ public class GeometryWrapperTest {
         //Expect the coordinates to be reversed as JTS is x,y and WGS84 is y,x
         Geometry expResult = GEOMETRY_FACTORY.createPoint(new Coordinate(2.0, 1.0));
         Geometry result = instance.getXYGeometry();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -146,9 +137,6 @@ public class GeometryWrapperTest {
         Coordinate[] coordinates = {new Coordinate(-180.0, 10.0), new Coordinate(-180.0, 20.0), new Coordinate(-170.0, 20.0), new Coordinate(-170.0, 10.0), new Coordinate(-180.0, 10.0)};
         Geometry expResult = GEOMETRY_FACTORY.createPolygon(coordinates);
         Geometry result = instance.getXYGeometry();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -165,9 +153,6 @@ public class GeometryWrapperTest {
         //Expect coordinates to be same as supplied.
         Geometry expResult = GEOMETRY_FACTORY.createPoint(new Coordinate(1.0, 2.0));
         Geometry result = instance.getParsingGeometry();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +168,6 @@ public class GeometryWrapperTest {
 
         String expResult = SRS_URI.WGS84_CRS;
         String result = instance.getSrsURI();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +183,6 @@ public class GeometryWrapperTest {
 
         String expResult = SRS_URI.WGS84_CRS;
         String result = instance.getSRID();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -219,9 +198,6 @@ public class GeometryWrapperTest {
 
         String expResult = WKTDatatype.URI;
         String result = instance.getGeometryDatatypeURI();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -247,9 +223,6 @@ public class GeometryWrapperTest {
 
         double expResult = 10.0;
         double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -275,9 +248,6 @@ public class GeometryWrapperTest {
 
         double expResult = 0.025656; //Degree: 1.47
         double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
@@ -304,9 +274,6 @@ public class GeometryWrapperTest {
 
         double expResult = 10.0;
         double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -333,9 +300,6 @@ public class GeometryWrapperTest {
 
         double expResult = 111320; //1.0 degree of longigtude at the equator is approx 111.32km.
         double result = instance.distanceEuclidean(targetGeometry, distanceUnitsURL);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 1);
     }
 
@@ -351,9 +315,6 @@ public class GeometryWrapperTest {
         GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
 
         GeometryWrapper expResult = GeometryWrapper.getEmptyWKT();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -370,9 +331,6 @@ public class GeometryWrapperTest {
         GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, WKTDatatype.URI, DimensionInfo.XY_POINT);
 
         GeometryWrapper expResult = GeometryWrapper.getEmptyWKT();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -389,9 +347,6 @@ public class GeometryWrapperTest {
         GeometryWrapper result = new GeometryWrapper(instanceGeo, instanceSRSURI, GMLDatatype.URI, DimensionInfo.XY_POINT);
 
         GeometryWrapper expResult = GeometryWrapper.getEmptyGML();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -408,9 +363,6 @@ public class GeometryWrapperTest {
 
         Literal result = instance.asLiteral();
         Literal expResult = ResourceFactory.createTypedLiteral(lexicalForm, WKTDatatype.INSTANCE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -428,9 +380,6 @@ public class GeometryWrapperTest {
         Literal result = instance.asLiteral(GMLDatatype.URI);
         String gmlGeometryLiteral = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
         Literal expResult = ResourceFactory.createTypedLiteral(gmlGeometryLiteral, GMLDatatype.INSTANCE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -448,9 +397,6 @@ public class GeometryWrapperTest {
         Literal result = instance.asLiteral(GMLDatatype.INSTANCE);
         String gmlGeometryLiteral = "<gml:Point xmlns:gml=\"http://www.opengis.net/ont/gml\" srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:pos>-83.38 33.95</gml:pos></gml:Point>";
         Literal expResult = ResourceFactory.createTypedLiteral(gmlGeometryLiteral, GMLDatatype.INSTANCE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -469,9 +415,6 @@ public class GeometryWrapperTest {
 
         double expResult = 343.77;
         double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.1);
     }
 
@@ -490,9 +433,6 @@ public class GeometryWrapperTest {
 
         double expResult = 104.4890;
         double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -511,9 +451,6 @@ public class GeometryWrapperTest {
 
         double expResult = 104.4890;
         double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -530,9 +467,6 @@ public class GeometryWrapperTest {
         GeometryWrapper geometryWrapper = GeometryWrapper.extract("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((10.0 180.0, 20.0 180.0, 20.0 190.0, 10.0 190.0, 10.0 180.0))", WKTDatatype.URI);
         Geometry expResult = geometryWrapper.getXYGeometry();
         Geometry result = instance.translateXYGeometry();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -548,9 +482,6 @@ public class GeometryWrapperTest {
         //Exp Result is unchanged as only geographic SRS are translated.
         Geometry expResult = instance.getXYGeometry();
         Geometry result = instance.translateXYGeometry();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -569,9 +500,6 @@ public class GeometryWrapperTest {
 
         double expResult = 0.0;
         double result = instance.distanceGreatCircle(testGeometryWrapper, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
index 1b03eea..cbedabb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/SRSInfoTest.java
@@ -67,9 +67,6 @@ public class SRSInfoTest {
         Boolean isAxisXY = SRSInfo.checkAxisXY(crs);
         Envelope expResult = new Envelope(-180, 180, -90, 90);
         Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -87,9 +84,6 @@ public class SRSInfoTest {
 
         Envelope expResult = new Envelope(-180, 180, -90, 90);
         Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +101,6 @@ public class SRSInfoTest {
 
         Envelope expResult = new Envelope(-118397.00138845091, 751441.7790901454, -16627.734375018626, 1272149.3463499574);
         Envelope result = SRSInfo.buildDomainEnvelope(crs, isAxisXY);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -124,9 +115,6 @@ public class SRSInfoTest {
         CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.WGS84_CRS);
         Boolean expResult = false;
         Boolean result = SRSInfo.checkAxisXY(crs);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -141,9 +129,6 @@ public class SRSInfoTest {
         CoordinateReferenceSystem crs = CRS.forCode("CRS:84");
         Boolean expResult = true;
         Boolean result = SRSInfo.checkAxisXY(crs);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -158,9 +143,6 @@ public class SRSInfoTest {
         CoordinateReferenceSystem crs = CRS.forCode(SRS_URI.OSGB36_CRS);
         Boolean expResult = true;
         Boolean result = SRSInfo.checkAxisXY(crs);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
index f2909bc..8eb3563 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/UnitsOfMeasureTest.java
@@ -102,9 +102,6 @@ public class UnitsOfMeasureTest {
         UnitsOfMeasure targetUnitsOfMeasure = new UnitsOfMeasure(crs);
         double expResult = 100.0;
         double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -123,9 +120,6 @@ public class UnitsOfMeasureTest {
         UnitsOfMeasure targetUnitsOfMeasure = new UnitsOfMeasure(crs);
         double expResult = 100.0;
         double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -145,9 +139,6 @@ public class UnitsOfMeasureTest {
         double radsToDegrees = 180 / Math.PI;
         double expResult = distance * radsToDegrees;
         double result = UnitsOfMeasure.conversion(distance, sourceDistanceUnitURI, targetUnitsOfMeasure.getUnitURI());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -180,9 +171,6 @@ public class UnitsOfMeasureTest {
         double latitude = 0.0;
         double expResult = 1.0;
         double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -197,9 +185,6 @@ public class UnitsOfMeasureTest {
         double latitude = 23.0;
         double expResult = 1.0;
         double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -214,9 +199,6 @@ public class UnitsOfMeasureTest {
         double latitude = 45.0;
         double expResult = 1.0;
         double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -231,9 +213,6 @@ public class UnitsOfMeasureTest {
         double latitude = 67.0;
         double expResult = 1.0;
         double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -248,9 +227,6 @@ public class UnitsOfMeasureTest {
         double latitude = 67.0;
         double expResult = 1.0;
         double result = UnitsOfMeasure.convertToDegrees(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -265,9 +241,6 @@ public class UnitsOfMeasureTest {
         double latitude = 0.0;
         double expResult = 111319.8922;
         double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
@@ -282,9 +255,6 @@ public class UnitsOfMeasureTest {
         double latitude = 23.0;
         double expResult = 102470.501;
         double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
@@ -299,9 +269,6 @@ public class UnitsOfMeasureTest {
         double latitude = 45.0;
         double expResult = 78715.050;
         double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
@@ -316,9 +283,6 @@ public class UnitsOfMeasureTest {
         double latitude = 67.0;
         double expResult = 43496.147;
         double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
@@ -333,9 +297,6 @@ public class UnitsOfMeasureTest {
         double latitude = 67.0;
         double expResult = 43496.15;
         double result = UnitsOfMeasure.convertToMetres(distance, unitsURI, latitude);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.001);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
index adcb40f..4d64208 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GMLDatatypeTest.java
@@ -93,9 +93,6 @@ public class GMLDatatypeTest {
         GeometryWrapper geometry = new GeometryWrapper(point, srsURI, GMLDatatype.URI, dimensionInfo);
 
         String result = instance.unparse(geometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
index 564eeeb..80becc5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/datatype/GeometryDatatypeTest.java
@@ -62,9 +62,6 @@ public class GeometryDatatypeTest {
         RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
         GeometryDatatype expResult = WKTDatatype.INSTANCE;
         GeometryDatatype result = GeometryDatatype.get(rdfDatatype);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -88,9 +85,6 @@ public class GeometryDatatypeTest {
         String datatypeURI = WKTDatatype.URI;
         GeometryDatatype expResult = WKTDatatype.INSTANCE;
         GeometryDatatype result = GeometryDatatype.get(datatypeURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class GeometryDatatypeTest {
         String datatypeURI = WKTDatatype.URI;
         boolean expResult = true;
         boolean result = GeometryDatatype.checkURI(datatypeURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -119,9 +110,6 @@ public class GeometryDatatypeTest {
         GeometryDatatype.checkURI(datatypeURI);
         boolean expResult = false;
         boolean result = GeometryDatatype.checkURI(datatypeURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -134,9 +122,6 @@ public class GeometryDatatypeTest {
         RDFDatatype rdfDatatype = WKTDatatype.INSTANCE;
         boolean expResult = true;
         boolean result = GeometryDatatype.check(rdfDatatype);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class GeometryDatatypeTest {
         RDFDatatype rdfDatatype = XSDDatatype.XSDdouble;
         boolean expResult = false;
         boolean result = GeometryDatatype.check(rdfDatatype);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
index e8a2ca3..bed4255 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AngleTest.java
@@ -61,9 +61,6 @@ public class AngleTest {
         double y2 = 100.0;
         double expResult = Math.toRadians(42.273689);
         double result = Angle.find(x1, y1, x2, y2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.000001);
     }
 
@@ -79,9 +76,6 @@ public class AngleTest {
         double y2 = 100.0;
         double expResult = Math.toRadians(312.273689);
         double result = Angle.find(x1, y1, x2, y2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.000001);
     }
 
@@ -97,9 +91,6 @@ public class AngleTest {
         double y2 = 45.0;
         double expResult = Math.toRadians(222.273689);
         double result = Angle.find(x1, y1, x2, y2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.000001);
     }
 
@@ -115,9 +106,6 @@ public class AngleTest {
         double y2 = 45.0;
         double expResult = Math.toRadians(132.273689);
         double result = Angle.find(x1, y1, x2, y2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.000001);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
index 21de4c8..35ab83d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/AzimuthTest.java
@@ -61,9 +61,6 @@ public class AzimuthTest {
         double lon2 = 10.0;
         double expResult = Math.toRadians(90);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -79,9 +76,6 @@ public class AzimuthTest {
         double lon2 = 0.0;
         double expResult = Math.toRadians(0);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -97,9 +91,6 @@ public class AzimuthTest {
         double lon2 = 0.0;
         double expResult = Math.toRadians(180);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -115,9 +106,6 @@ public class AzimuthTest {
         double lon2 = -10.0;
         double expResult = Math.toRadians(270);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -133,9 +121,6 @@ public class AzimuthTest {
         double lon2 = -170.0;
         double expResult = Math.toRadians(90);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -151,9 +136,6 @@ public class AzimuthTest {
         double lon2 = 170.0;
         double expResult = Math.toRadians(270);
         double result = Azimuth.find(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
index 9cd580f..5059391 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/CoordinatePairTest.java
@@ -63,9 +63,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(180, 20), new Coordinate(179, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -80,9 +77,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(180, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +91,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(1, 20), new Coordinate(-1, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -114,9 +105,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(178, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -131,9 +119,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(-179, 20), new Coordinate(-178, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -148,9 +133,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(179, 20), new Coordinate(1, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -165,9 +147,6 @@ public class CoordinatePairTest {
 
         CoordinatePair expResult = new CoordinatePair(new Coordinate(-179, 20), new Coordinate(-1, 20));
         CoordinatePair result = CoordinatePair.findNearestPair(sourceGeometry, targetGeometry);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -184,9 +163,6 @@ public class CoordinatePairTest {
 
         boolean expResult = true;
         boolean result = instance.isEqual();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -203,9 +179,6 @@ public class CoordinatePairTest {
 
         boolean expResult = false;
         boolean result = instance.isEqual();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -222,9 +195,6 @@ public class CoordinatePairTest {
 
         boolean expResult = true;
         boolean result = instance.isEqual();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -241,9 +211,6 @@ public class CoordinatePairTest {
 
         boolean expResult = false;
         boolean result = instance.isEqual();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
index 1cd9558..fb4084d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCircleDistanceTest.java
@@ -61,9 +61,6 @@ public class GreatCircleDistanceTest {
         double lon2 = 2.34880;
         double expResult = 343771;
         double result = GreatCircleDistance.vincentyFormula(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 1);
     }
 
@@ -79,9 +76,6 @@ public class GreatCircleDistanceTest {
         double lon1 = 2.34880;
         double expResult = 343771;
         double result = GreatCircleDistance.vincentyFormula(lat1, lon1, lat2, lon2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 1);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
index ffa246a..4e2aab9 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/great_circle/GreatCirclePointDistanceTest.java
@@ -65,9 +65,6 @@ public class GreatCirclePointDistanceTest {
         GreatCirclePointDistance instance = new GreatCirclePointDistance(startLat, startLon, distance);
         double expResult = 0.868348;
         double result = instance.latitude(bearingRad);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -85,9 +82,6 @@ public class GreatCirclePointDistanceTest {
         GreatCirclePointDistance instance = new GreatCirclePointDistance(startLat, startLon, distance);
         double expResult = -0.040994;
         double result = instance.longitude(endLatRad, bearingRad);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.00001);
     }
 
@@ -101,9 +95,6 @@ public class GreatCirclePointDistanceTest {
         double lonRad = 0.1;
         LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(lonRad));
         LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class GreatCirclePointDistanceTest {
         boolean isNormaliseLon = false;
         LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(lonRad));
         LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad, isNormaliseLon);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class GreatCirclePointDistanceTest {
         boolean isNormaliseLon = true;
         LatLonPoint expResult = new LatLonPoint(Math.toDegrees(latRad), Math.toDegrees(-Math.PI + 0.2));
         LatLonPoint result = GreatCirclePointDistance.radToPoint(latRad, lonRad, isNormaliseLon);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +135,6 @@ public class GreatCirclePointDistanceTest {
         double lonDegrees = 185;
         double expResult = -175;
         double result = GreatCirclePointDistance.normaliseLongitude(lonDegrees);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0);
     }
 
@@ -170,9 +152,6 @@ public class GreatCirclePointDistanceTest {
         double bearing = 0.0;
         LatLonPoint expResult = new LatLonPoint(49.752730367761664, -2.3488);
         LatLonPoint result = GreatCirclePointDistance.getPoint(startPoint, distance, bearing);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -188,9 +167,6 @@ public class GreatCirclePointDistanceTest {
         double bearing = 0.0;
         LatLonPoint expResult = new LatLonPoint(49.752730367761664, -2.3488);
         LatLonPoint result = GreatCirclePointDistance.getPoint(startLat, startLon, distance, bearing);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -208,9 +184,6 @@ public class GreatCirclePointDistanceTest {
         double bearing = 90.0;
         LatLonPoint expResult = new LatLonPoint(48.84533344929755, -0.9821733277296272);
         LatLonPoint result = GreatCirclePointDistance.getPoint(startPoint, distance, bearing);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -226,9 +199,6 @@ public class GreatCirclePointDistanceTest {
         double bearing = 90.0;
         LatLonPoint expResult = new LatLonPoint(48.84533344929755, -0.9821733277296272);
         LatLonPoint result = GreatCirclePointDistance.getPoint(startLat, startLon, distance, bearing);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
index 174d459..d38d648 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/jts/CoordinateSequenceDimensionsTest.java
@@ -62,9 +62,6 @@ public class CoordinateSequenceDimensionsTest {
         Coordinate coordinate = new Coordinate(1.0, 2.0);
         CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
         CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -77,9 +74,6 @@ public class CoordinateSequenceDimensionsTest {
         Coordinate coordinate = new CoordinateXY(1.0, 2.0);
         CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XY;
         CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -92,9 +86,6 @@ public class CoordinateSequenceDimensionsTest {
         Coordinate coordinate = new Coordinate(1.0, 2.0, 3.0);
         CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZ;
         CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +98,6 @@ public class CoordinateSequenceDimensionsTest {
         Coordinate coordinate = new CoordinateXYM(1.0, 2.0, 3.0);
         CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYM;
         CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -122,9 +110,6 @@ public class CoordinateSequenceDimensionsTest {
         Coordinate coordinate = new CoordinateXYZM(1.0, 2.0, 3.0, 4.0);
         CoordinateSequenceDimensions expResult = CoordinateSequenceDimensions.XYZM;
         CoordinateSequenceDimensions result = CoordinateSequenceDimensions.find(coordinate);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
index 9cc9555..dd6973d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/implementation/registry/SRSRegistryTest.java
@@ -65,9 +65,6 @@ public class SRSRegistryTest {
         String srsURI = "http://www.opengis.net/def/crs/EPSG/0/4326";
         CoordinateReferenceSystem expResult = CRS.forCode(srsURI);
         CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -94,9 +91,6 @@ public class SRSRegistryTest {
 
             CoordinateReferenceSystem expResult = CRS.fromWKT(default_CRS_WKT);
             CoordinateReferenceSystem result = SRSRegistry.getCRS(srsURI);
-
-            //System.out.println("Exp: " + expResult);
-            //System.out.println("Res: " + result);
             assertEquals(expResult.toWKT(), result.toWKT());
         } catch (FactoryException ex) {
             System.out.println("Default WKT CRS error: " + ex.getMessage());
@@ -113,9 +107,6 @@ public class SRSRegistryTest {
         String srsURI = SRS_URI.WGS84_CRS;
         Boolean expResult = false;
         Boolean result = SRSRegistry.getAxisXY(srsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -129,9 +120,6 @@ public class SRSRegistryTest {
         String srsURI = SRS_URI.DEFAULT_WKT_CRS84;
         Boolean expResult = true;
         Boolean result = SRSRegistry.getAxisXY(srsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -145,9 +133,6 @@ public class SRSRegistryTest {
         String srsURI = SRS_URI.OSGB36_CRS;
         Boolean expResult = true;
         Boolean result = SRSRegistry.getAxisXY(srsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
index f453601..450d1c6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonBoxTest.java
@@ -67,9 +67,6 @@ public class ConvertLatLonBoxTest {
         float lonMax = 11.0F;
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))";
         String result = ConvertLatLonBox.toWKT(latMin, lonMin, latMax, lonMax);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -85,9 +82,6 @@ public class ConvertLatLonBoxTest {
         float lonMax = 11.0F;
         Literal expResult = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
         Literal result = ConvertLatLonBox.toLiteral(latMin, lonMin, latMax, lonMax);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -103,9 +97,6 @@ public class ConvertLatLonBoxTest {
         NodeValue v4 = NodeValue.makeFloat(11.0f);
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
         NodeValue result = ConvertLatLonBox.toNodeValue(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -121,9 +112,6 @@ public class ConvertLatLonBoxTest {
         Node n4 = NodeValue.makeFloat(11.0f).asNode();
         Node expResult = NodeFactory.createLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
         Node result = ConvertLatLonBox.toNode(n1, n2, n3, n4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
index 908528c..03c31b2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/ConvertLatLonTest.java
@@ -66,9 +66,6 @@ public class ConvertLatLonTest {
         NodeValue v2 = NodeValue.makeFloat(20.0f);
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
         NodeValue result = ConvertLatLon.toNodeValue(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -170,9 +167,6 @@ public class ConvertLatLonTest {
         float lon = 20.0F;
         String expResult = "<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)";
         String result = ConvertLatLon.toWKT(lat, lon);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -186,9 +180,6 @@ public class ConvertLatLonTest {
         float lon = 20.0F;
         Literal expResult = ResourceFactory.createTypedLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
         Literal result = ConvertLatLon.toLiteral(lat, lon);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -202,9 +193,6 @@ public class ConvertLatLonTest {
         Node n2 = NodeValue.makeFloat(20.0f).asNode();
         Node expResult = NodeFactory.createLiteral("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
         Node result = ConvertLatLon.toNode(n1, n2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
index 5253a6c..1505132 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/SearchEnvelopeTest.java
@@ -76,9 +76,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.NORTH;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, 10, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -92,9 +89,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.SOUTH;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(X1, X2, Y1, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -108,9 +102,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.EAST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(-20, 160, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -124,9 +115,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.WEST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(-160, 20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -140,9 +128,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.EAST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(100, 280, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -156,9 +141,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.WEST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(-200, -20, Y1, Y2), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -172,9 +154,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.NORTH;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, 20, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -188,9 +167,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.SOUTH;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, OS_X2, OS_Y1, 20), SpatialIndexTestData.OSGB_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -204,9 +180,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.EAST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(10, OS_X2, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -220,9 +193,6 @@ public class SearchEnvelopeTest {
         CardinalDirection direction = CardinalDirection.WEST;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(OS_X1, 10, OS_Y1, OS_Y2), SpatialIndexTestData.OSGB_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, direction);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -235,9 +205,6 @@ public class SearchEnvelopeTest {
         SearchEnvelope instance = new SearchEnvelope(new Envelope(0, 10, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
         Envelope expResult = new Envelope(0, 10, 0, 10);
         Envelope result = instance.getMainEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class SearchEnvelopeTest {
         SearchEnvelope instance = new SearchEnvelope(new Envelope(40, 220, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
         Envelope expResult = new Envelope(40, 180, 0, 10);
         Envelope result = instance.getMainEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -265,9 +229,6 @@ public class SearchEnvelopeTest {
         SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.WGS_84_SRS_INFO);
         Envelope expResult = new Envelope(-180, -40, 0, 10);
         Envelope result = instance.getMainEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -280,9 +241,6 @@ public class SearchEnvelopeTest {
         SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
         Envelope expResult = new Envelope(-220, -40, 0, 10);
         Envelope result = instance.getMainEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -296,9 +254,6 @@ public class SearchEnvelopeTest {
 
         Envelope expResult = null;
         Envelope result = instance.getWrapEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -312,9 +267,6 @@ public class SearchEnvelopeTest {
 
         Envelope expResult = new Envelope(-180, -140, 0, 10);
         Envelope result = instance.getWrapEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -328,9 +280,6 @@ public class SearchEnvelopeTest {
 
         Envelope expResult = new Envelope(140, 180, 0, 10);
         Envelope result = instance.getWrapEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -343,9 +292,6 @@ public class SearchEnvelopeTest {
         SearchEnvelope instance = new SearchEnvelope(new Envelope(-220, -40, 0, 10), SpatialIndexTestData.OSGB_SRS_INFO);
         Envelope expResult = null;
         Envelope result = instance.getWrapEnvelope();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -360,9 +306,6 @@ public class SearchEnvelopeTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(-0.08993203677616635, 0.08993203677616635, -0.08993203677616635, 0.08993203677616635), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -377,9 +320,6 @@ public class SearchEnvelopeTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         SearchEnvelope expResult = new SearchEnvelope(new Envelope(-10000, 10000, -10000, 10000), SpatialIndexTestData.OSGB_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.OSGB_SRS_INFO, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -392,9 +332,6 @@ public class SearchEnvelopeTest {
         GeometryWrapper geometryWrapper = SpatialIndexTestData.PARIS_GEOMETRY_WRAPPER;
         SearchEnvelope expResult = new SearchEnvelope(geometryWrapper.getEnvelope(), SpatialIndexTestData.WGS_84_SRS_INFO);
         SearchEnvelope result = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -415,9 +352,6 @@ public class SearchEnvelopeTest {
         //Function Test
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE));
         HashSet<Resource> result = instance.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -438,9 +372,6 @@ public class SearchEnvelopeTest {
         //Function Test
         HashSet<Resource> expResult = new HashSet<>();
         HashSet<Resource> result = instance.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
index 805237b..66de222 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleDegreesFFTest.java
@@ -77,9 +77,6 @@ public class AngleDegreesFFTest {
         AngleDegreesFF instance = new AngleDegreesFF();
         NodeValue expResult = NodeValue.makeDouble(42.27368900609373);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
index 076588b..945af0f 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AngleFFTest.java
@@ -77,9 +77,6 @@ public class AngleFFTest {
         AngleFF instance = new AngleFF();
         NodeValue expResult = NodeValue.makeDouble(0.7378150601204649);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
index 5aef81f..0a6b3a6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthDegreesFFTest.java
@@ -77,9 +77,6 @@ public class AzimuthDegreesFFTest {
         AzimuthDegreesFF instance = new AzimuthDegreesFF();
         NodeValue expResult = NodeValue.makeDouble(90);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
index 08a7712..c5aa740 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/AzimuthFFTest.java
@@ -77,9 +77,6 @@ public class AzimuthFFTest {
         AzimuthFF instance = new AzimuthFF();
         NodeValue expResult = NodeValue.makeDouble(1.5707963267948966);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
index 6f1cc68..56835d0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonBoxFFTest.java
@@ -78,9 +78,6 @@ public class ConvertLatLonBoxFFTest {
         ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0 1, 10 1, 10 11, 0 11, 0 1))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -97,9 +94,6 @@ public class ConvertLatLonBoxFFTest {
         ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -116,9 +110,6 @@ public class ConvertLatLonBoxFFTest {
         ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -135,9 +126,6 @@ public class ConvertLatLonBoxFFTest {
         ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -154,9 +142,6 @@ public class ConvertLatLonBoxFFTest {
         ConvertLatLonBoxFF instance = new ConvertLatLonBoxFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POLYGON((0.0 1.0, 10.0 1.0, 10.0 11.0, 0.0 11.0, 0.0 1.0))", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
index 0b8dba0..8d38507 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/ConvertLatLonFFTest.java
@@ -76,9 +76,6 @@ public class ConvertLatLonFFTest {
         ConvertLatLonFF instance = new ConvertLatLonFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10 20)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -93,9 +90,6 @@ public class ConvertLatLonFFTest {
         ConvertLatLonFF instance = new ConvertLatLonFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -110,9 +104,6 @@ public class ConvertLatLonFFTest {
         ConvertLatLonFF instance = new ConvertLatLonFF();
         NodeValue expResult = NodeValue.makeNode("<http://www.opengis.net/def/crs/EPSG/0/4326> POINT(10.0 20.0)", WKTDatatype.INSTANCE);
         NodeValue result = instance.exec(v1, v2);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
index 22c3f07..c8e2519 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/DistanceFFTest.java
@@ -80,9 +80,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 109.5057;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -98,9 +95,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 111.1950;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -116,9 +110,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 343.7713;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -134,9 +125,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         double expResult = 10;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -152,9 +140,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -170,9 +155,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -188,9 +170,6 @@ public class DistanceFFTest {
         DistanceFF instance = new DistanceFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
index 669b27a..c1c2c51 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/EqualsFFTest.java
@@ -67,9 +67,6 @@ public class EqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -84,9 +81,6 @@ public class EqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +95,6 @@ public class EqualsFFTest {
 
         Boolean expResult = true;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -118,9 +109,6 @@ public class EqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -135,9 +123,6 @@ public class EqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +137,6 @@ public class EqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -169,9 +151,6 @@ public class EqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -186,9 +165,6 @@ public class EqualsFFTest {
 
         Boolean expResult = false;
         Boolean result = instance.relate(subjectGeometryWrapper, objectGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -201,9 +177,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisjoint();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -216,9 +189,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = false;
         boolean result = instance.isDisconnected();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +203,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -250,9 +217,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +231,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -284,9 +245,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -301,9 +259,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -318,9 +273,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -335,9 +287,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -352,9 +301,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -369,9 +315,6 @@ public class EqualsFFTest {
         EqualsFF instance = new EqualsFF();
         boolean expResult = true;
         boolean result = instance.permittedTopology(sourceDimensionInfo, targetDimensionInfo);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
index 1e39f22..826374e 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleFFTest.java
@@ -81,9 +81,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         double expResult = 109.5057;
         double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -101,9 +98,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         double expResult = 111.1950;
         double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -122,9 +116,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         double expResult = 343.7713;
         double result = instance.exec(v1, v2, v3, v4, v5).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -142,9 +133,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -162,9 +150,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -182,9 +167,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -202,9 +184,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -222,9 +201,6 @@ public class GreatCircleFFTest {
         GreatCircleFF instance = new GreatCircleFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3, v4, v5);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
index 441ba94..6b2b16a 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/GreatCircleGeomFFTest.java
@@ -80,9 +80,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         double expResult = 109.5057;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -98,9 +95,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         double expResult = 111.1950;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -116,9 +110,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         double expResult = 343.7713;
         double result = instance.exec(v1, v2, v3).getDouble();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result, 0.0001);
     }
 
@@ -134,9 +125,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -152,9 +140,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -170,9 +155,6 @@ public class GreatCircleGeomFFTest {
         GreatCircleGeomFF instance = new GreatCircleGeomFF();
         NodeValue expResult = NodeValue.makeDouble(20);
         NodeValue result = instance.exec(v1, v2, v3);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
index 488a447..d102b61 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/filter_functions/NearbyFFTest.java
@@ -82,9 +82,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -101,9 +98,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -120,9 +114,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -139,9 +130,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(false);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -158,9 +146,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(false);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -176,9 +161,6 @@ public class NearbyFFTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         boolean expResult = true;
         boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -194,9 +176,6 @@ public class NearbyFFTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         boolean expResult = true;
         boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -212,9 +191,6 @@ public class NearbyFFTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         boolean expResult = false;
         boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -230,9 +206,6 @@ public class NearbyFFTest {
         String unitsURI = Unit_URI.KILOMETER_URL;
         boolean expResult = false;
         boolean result = NearbyFF.relate(geometry1, geometry2, radius, unitsURI);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -249,9 +222,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -268,9 +238,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -287,9 +254,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -306,9 +270,6 @@ public class NearbyFFTest {
         NearbyFF instance = new NearbyFF();
         NodeValue expResult = NodeValue.makeBoolean(true);
         NodeValue result = instance.exec(v1, v2, v3, v4);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
index 70b6105..352f3a0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/EqualsPFTest.java
@@ -64,9 +64,6 @@ public class EqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -81,9 +78,6 @@ public class EqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -98,9 +92,6 @@ public class EqualsPFTest {
 
         Boolean expResult = true;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -115,9 +106,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -132,9 +120,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +134,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -166,9 +148,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -183,9 +162,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(subjectGeometryLiteral.asNode(), objectGeometryLiteral.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -203,9 +179,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyGML.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -223,9 +196,6 @@ public class EqualsPFTest {
 
         Boolean expResult = false;
         Boolean result = instance.testFilterFunction(emptyWKT.asNode(), emptyWKT2.asNode());
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
index cc3ede2..f959986 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialGeomPropertyFunctionTest.java
@@ -90,9 +90,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -123,9 +120,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -156,9 +150,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -189,9 +180,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -222,9 +210,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -255,9 +240,6 @@ public class GenericSpatialGeomPropertyFunctionTest {
         GenericSpatialGeomPropertyFunction instance = new IntersectBoxGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
index a1280a5..f831dcb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/GenericSpatialPropertyFunctionTest.java
@@ -95,9 +95,6 @@ public class GenericSpatialPropertyFunctionTest {
         }
 
         List<Resource> expResult = new ArrayList<>();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -128,9 +125,6 @@ public class GenericSpatialPropertyFunctionTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -162,9 +156,6 @@ public class GenericSpatialPropertyFunctionTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -196,9 +187,6 @@ public class GenericSpatialPropertyFunctionTest {
         }
 
         List<Resource> expResult = new ArrayList<>();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -233,9 +221,6 @@ public class GenericSpatialPropertyFunctionTest {
         }
 
         List<Resource> expResult = Arrays.asList(geoFeature);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
index 04dd41f..708a3b7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/GenericSpatialBoxPropertyFunctionTest.java
@@ -92,9 +92,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -127,9 +124,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -162,9 +156,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -197,9 +188,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -232,9 +220,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -267,9 +252,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -302,9 +284,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -337,9 +316,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -372,9 +348,6 @@ public class GenericSpatialBoxPropertyFunctionTest {
 
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
index 7d3c6b8..aba4bc8 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxGeomPFTest.java
@@ -103,9 +103,6 @@ public class IntersectBoxGeomPFTest {
         //Test arguments
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -142,9 +139,6 @@ public class IntersectBoxGeomPFTest {
         //Test arguments
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -176,9 +170,6 @@ public class IntersectBoxGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
index ec3ac45..0b8b4bb 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/IntersectBoxPFTest.java
@@ -102,9 +102,6 @@ public class IntersectBoxPFTest {
         //Test arguments
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -140,9 +137,6 @@ public class IntersectBoxPFTest {
         //Test arguments
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -173,9 +167,6 @@ public class IntersectBoxPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
index 8f35d6f..082ecf0 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxGeomPFTest.java
@@ -103,9 +103,6 @@ public class WithinBoxGeomPFTest {
         //Test arguments
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -142,9 +139,6 @@ public class WithinBoxGeomPFTest {
         //Test arguments
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -176,9 +170,6 @@ public class WithinBoxGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
index 35ba433..eafb379 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/box/WithinBoxPFTest.java
@@ -102,9 +102,6 @@ public class WithinBoxPFTest {
         //Test arguments
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -140,9 +137,6 @@ public class WithinBoxPFTest {
         //Test arguments
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -173,9 +167,6 @@ public class WithinBoxPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
index 822031f..76701a7 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastGeomPFTest.java
@@ -76,9 +76,6 @@ public class EastGeomPFTest {
         EastGeomPF instance = new EastGeomPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.EAST);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -96,9 +93,6 @@ public class EastGeomPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +110,6 @@ public class EastGeomPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +141,6 @@ public class EastGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
index 9461646..ac2e838 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/EastPFTest.java
@@ -76,9 +76,6 @@ public class EastPFTest {
         EastPF instance = new EastPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.EAST);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -96,9 +93,6 @@ public class EastPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +110,6 @@ public class EastPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +140,6 @@ public class EastPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
index 9dd4caf..9541316 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalGeomPropertyFunctionTest.java
@@ -86,9 +86,6 @@ public class GenericCardinalGeomPropertyFunctionTest {
 
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArgumemts, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -117,9 +114,6 @@ public class GenericCardinalGeomPropertyFunctionTest {
 
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArgumemts, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
index 862e466..8a09c80 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/GenericCardinalPropertyFunctionTest.java
@@ -87,9 +87,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -117,9 +114,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -147,9 +141,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -177,9 +168,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -207,9 +195,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -237,9 +222,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -267,9 +249,6 @@ public class GenericCardinalPropertyFunctionTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
index 646c992..64f160d 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthGeomPFTest.java
@@ -74,9 +74,6 @@ public class NorthGeomPFTest {
         NorthGeomPF instance = new NorthGeomPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.NORTH);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -108,9 +105,6 @@ public class NorthGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
index 1265007..659e4f4 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/NorthPFTest.java
@@ -74,9 +74,6 @@ public class NorthPFTest {
         NorthPF instance = new NorthPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.NORTH);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +104,6 @@ public class NorthPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
index 463f456..f1811a6 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthGeomPFTest.java
@@ -74,9 +74,6 @@ public class SouthGeomPFTest {
         SouthGeomPF instance = new SouthGeomPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.SOUTH);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -108,9 +105,6 @@ public class SouthGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
index 2117bc6..a17fe35 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/SouthPFTest.java
@@ -74,9 +74,6 @@ public class SouthPFTest {
         SouthPF instance = new SouthPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.SOUTH);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -107,9 +104,6 @@ public class SouthPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE, SpatialIndexTestData.PERTH_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
index df26bae..26fe2f2 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestGeomPFTest.java
@@ -76,9 +76,6 @@ public class WestGeomPFTest {
         WestGeomPF instance = new WestGeomPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.WEST);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -96,9 +93,6 @@ public class WestGeomPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.PERTH_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +110,6 @@ public class WestGeomPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -150,9 +141,6 @@ public class WestGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
index a815863..0835c91 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/cardinal/WestPFTest.java
@@ -76,9 +76,6 @@ public class WestPFTest {
         WestPF instance = new WestPF();
         SearchEnvelope expResult = SearchEnvelope.build(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO, CardinalDirection.WEST);
         SearchEnvelope result = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -96,9 +93,6 @@ public class WestPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.PERTH_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -116,9 +110,6 @@ public class WestPFTest {
         SearchEnvelope searchEnvelope = instance.buildSearchEnvelope(geometryWrapper, SpatialIndexTestData.WGS_84_SRS_INFO); //Needed to initialise the search.
         HashSet<Resource> expResult = new HashSet<>(Arrays.asList(SpatialIndexTestData.AUCKLAND_FEATURE, SpatialIndexTestData.PERTH_FEATURE, SpatialIndexTestData.HONOLULU_FEATURE));
         HashSet<Resource> result = searchEnvelope.check(spatialIndex);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -149,9 +140,6 @@ public class WestPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.HONOLULU_FEATURE, SpatialIndexTestData.LONDON_FEATURE, SpatialIndexTestData.NEW_YORK_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
index 48dce79..e2a9bf1 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyGeomPFTest.java
@@ -97,9 +97,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -127,9 +124,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -157,9 +151,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +178,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -217,9 +205,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -247,9 +232,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -277,9 +259,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -307,9 +286,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -337,9 +313,6 @@ public class NearbyGeomPFTest {
         NearbyGeomPF instance = new NearbyGeomPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -373,9 +346,6 @@ public class NearbyGeomPFTest {
         //Test arguments
         boolean expResult = true;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -409,9 +379,6 @@ public class NearbyGeomPFTest {
         //Test arguments
         boolean expResult = false;
         boolean result = instance.checkSecondFilter(spatialArguments, targetGeometryWrapper);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -443,9 +410,6 @@ public class NearbyGeomPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -478,9 +442,6 @@ public class NearbyGeomPFTest {
         }
 
         List<Resource> expResult = new ArrayList<>();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
diff --git a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
index 8609dfd..22f55c5 100644
--- a/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
+++ b/jena-geosparql/src/test/java/org/apache/jena/geosparql/spatial/property_functions/nearby/NearbyPFTest.java
@@ -97,9 +97,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -127,9 +124,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -157,9 +151,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -187,9 +178,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -217,9 +205,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -247,9 +232,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -277,9 +259,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -307,9 +286,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -337,9 +313,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -367,9 +340,6 @@ public class NearbyPFTest {
         NearbyPF instance = new NearbyPF();
         SpatialArguments expResult = new SpatialArguments(limit, geometryWrapper, searchEnvelope);
         SpatialArguments result = instance.extractObjectArguments(predicate, object, SpatialIndexTestData.WGS_84_SRS_INFO);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         //assertEquals(expResult, result);
     }
 
@@ -400,9 +370,6 @@ public class NearbyPFTest {
         }
 
         List<Resource> expResult = Arrays.asList(SpatialIndexTestData.LONDON_FEATURE);
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 
@@ -434,9 +401,6 @@ public class NearbyPFTest {
         }
 
         List<Resource> expResult = new ArrayList<>();
-
-        //System.out.println("Exp: " + expResult);
-        //System.out.println("Res: " + result);
         assertEquals(expResult, result);
     }
 }