diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommandLineArguments.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommandLineArguments.java
index afc064e..a07938f 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommandLineArguments.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommandLineArguments.java
@@ -7,9 +7,8 @@
 import java.util.List;
 
 /**
- * Declares supported command line arguments that are parsed using the
- * JCommander library. All arguments are optional. The default values are as
- * follows:
+ * Declares supported command line arguments that are parsed using the JCommander library.
+ * All arguments are optional. The default values are as follows:
  * <ul>
  * <li>XML properties file: ${user.home}/test-run-props.xml</li>
  * <li>outputDir: ${user.home}</li>
@@ -26,35 +25,38 @@
  */
 public class CommandLineArguments {
 
-    @Parameter(description = "Properties file")
-    private final List<String> xmlProps;
-
-    @Parameter(names = {"-o", "--outputDir"}, description = "Output directory")
-    private String outputDir;
-
-    @Parameter(names = {"-d", "--deleteSubjectOnFinish"}, description = "Delete file containing representation of test subject when finished")
-    private boolean deleteSubjectOnFinish = false;
-
-    public CommandLineArguments() {
-        this.xmlProps = new ArrayList<>();
-    }
-
-    public File getPropertiesFile() {
-        File fileRef;
-        if (xmlProps.isEmpty()) {
-            fileRef = new File(System.getProperty("user.home"), "test-run-props.xml");
-        } else {
-            String propsFile = xmlProps.get(0);
-            fileRef = (propsFile.startsWith("file:")) ? new File(URI.create(propsFile)) : new File(propsFile);
-        }
-        return fileRef;
-    }
-
-    public String getOutputDir() {
-        return (null != outputDir) ? outputDir : System.getProperty("user.home");
-    }
-
-    public boolean doDeleteSubjectOnFinish() {
-        return deleteSubjectOnFinish;
-    }
+	@Parameter(description = "Properties file")
+	private final List<String> xmlProps;
+
+	@Parameter(names = { "-o", "--outputDir" }, description = "Output directory")
+	private String outputDir;
+
+	@Parameter(names = { "-d", "--deleteSubjectOnFinish" },
+			description = "Delete file containing representation of test subject when finished")
+	private boolean deleteSubjectOnFinish = false;
+
+	public CommandLineArguments() {
+		this.xmlProps = new ArrayList<>();
+	}
+
+	public File getPropertiesFile() {
+		File fileRef;
+		if (xmlProps.isEmpty()) {
+			fileRef = new File(System.getProperty("user.home"), "test-run-props.xml");
+		}
+		else {
+			String propsFile = xmlProps.get(0);
+			fileRef = (propsFile.startsWith("file:")) ? new File(URI.create(propsFile)) : new File(propsFile);
+		}
+		return fileRef;
+	}
+
+	public String getOutputDir() {
+		return (null != outputDir) ? outputDir : System.getProperty("user.home");
+	}
+
+	public boolean doDeleteSubjectOnFinish() {
+		return deleteSubjectOnFinish;
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonDataFixture.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonDataFixture.java
index ac2ffbf..ececb65 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonDataFixture.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonDataFixture.java
@@ -20,64 +20,67 @@
  */
 public class CommonDataFixture extends CommonFixture {
 
-    private static final int DEFAULT_NUMBER_OF_COLLECTIONS = 3;
-
-    private OpenApi3 apiModel;
-
-    private List<RequirementClass> requirementClasses;
-
-    protected int noOfCollections = DEFAULT_NUMBER_OF_COLLECTIONS;
-
-    @BeforeClass
-    public void requirementClasses( ITestContext testContext ) {
-        this.requirementClasses = (List<RequirementClass>) testContext.getSuite().getAttribute( REQUIREMENTCLASSES.getName() );
-    }
-
-    @BeforeClass
-    public void noOfCollections( ITestContext testContext ) {
-        Object noOfCollections = testContext.getSuite().getAttribute( NO_OF_COLLECTIONS.getName() );
-        if ( noOfCollections != null ) {
-            this.noOfCollections = (Integer) noOfCollections;
-        }
-    }
-
-    @BeforeClass
-    public void retrieveApiModel( ITestContext testContext ) {
-        this.apiModel = (OpenApi3) testContext.getSuite().getAttribute( API_MODEL.getName() );
-    }
-
-    public OpenApi3 getApiModel() {
-        if ( apiModel == null )
-            throw new SkipException( "ApiModel is not available." );
-        return apiModel;
-    }
-
-    protected List<String> createListOfMediaTypesToSupportForOtherResources( Map<String, Object> linkToSelf ) {
-        if ( this.requirementClasses == null )
-            throw new SkipException( "No requirement classes described in  resource /conformance available" );
-        List<String> mediaTypesToSupport = new ArrayList<>();
-        for ( RequirementClass requirementClass : this.requirementClasses )
-            if ( requirementClass.hasMediaTypeForOtherResources() )
-                mediaTypesToSupport.add( requirementClass.getMediaTypeOtherResources() );
-        if ( linkToSelf != null )
-            mediaTypesToSupport.remove( linkToSelf.get( "type" ) );
-        return mediaTypesToSupport;
-    }
-
-    protected List<String> createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures() {
-        if ( this.requirementClasses == null )
-            throw new SkipException( "No requirement classes described in  resource /conformance available" );
-        List<String> mediaTypesToSupport = new ArrayList<>();
-        for ( RequirementClass requirementClass : this.requirementClasses )
-            if ( requirementClass.hasMediaTypeForFeaturesAndCollections() )
-                mediaTypesToSupport.add( requirementClass.getMediaTypeFeaturesAndCollections() );
-        return mediaTypesToSupport;
-    }
-
-    protected List<String> createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures( Map<String, Object> linkToSelf ) {
-        List<String> mediaTypesToSupport = createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures();
-        if ( linkToSelf != null )
-            mediaTypesToSupport.remove( linkToSelf.get( "type" ) );
-        return mediaTypesToSupport;
-    }
+	private static final int DEFAULT_NUMBER_OF_COLLECTIONS = 3;
+
+	private OpenApi3 apiModel;
+
+	private List<RequirementClass> requirementClasses;
+
+	protected int noOfCollections = DEFAULT_NUMBER_OF_COLLECTIONS;
+
+	@BeforeClass
+	public void requirementClasses(ITestContext testContext) {
+		this.requirementClasses = (List<RequirementClass>) testContext.getSuite()
+				.getAttribute(REQUIREMENTCLASSES.getName());
+	}
+
+	@BeforeClass
+	public void noOfCollections(ITestContext testContext) {
+		Object noOfCollections = testContext.getSuite().getAttribute(NO_OF_COLLECTIONS.getName());
+		if (noOfCollections != null) {
+			this.noOfCollections = (Integer) noOfCollections;
+		}
+	}
+
+	@BeforeClass
+	public void retrieveApiModel(ITestContext testContext) {
+		this.apiModel = (OpenApi3) testContext.getSuite().getAttribute(API_MODEL.getName());
+	}
+
+	public OpenApi3 getApiModel() {
+		if (apiModel == null)
+			throw new SkipException("ApiModel is not available.");
+		return apiModel;
+	}
+
+	protected List<String> createListOfMediaTypesToSupportForOtherResources(Map<String, Object> linkToSelf) {
+		if (this.requirementClasses == null)
+			throw new SkipException("No requirement classes described in  resource /conformance available");
+		List<String> mediaTypesToSupport = new ArrayList<>();
+		for (RequirementClass requirementClass : this.requirementClasses)
+			if (requirementClass.hasMediaTypeForOtherResources())
+				mediaTypesToSupport.add(requirementClass.getMediaTypeOtherResources());
+		if (linkToSelf != null)
+			mediaTypesToSupport.remove(linkToSelf.get("type"));
+		return mediaTypesToSupport;
+	}
+
+	protected List<String> createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures() {
+		if (this.requirementClasses == null)
+			throw new SkipException("No requirement classes described in  resource /conformance available");
+		List<String> mediaTypesToSupport = new ArrayList<>();
+		for (RequirementClass requirementClass : this.requirementClasses)
+			if (requirementClass.hasMediaTypeForFeaturesAndCollections())
+				mediaTypesToSupport.add(requirementClass.getMediaTypeFeaturesAndCollections());
+		return mediaTypesToSupport;
+	}
+
+	protected List<String> createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures(
+			Map<String, Object> linkToSelf) {
+		List<String> mediaTypesToSupport = createListOfMediaTypesToSupportForFeatureCollectionsAndFeatures();
+		if (linkToSelf != null)
+			mediaTypesToSupport.remove(linkToSelf.get("type"));
+		return mediaTypesToSupport;
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java
index 5573155..d816b70 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/CommonFixture.java
@@ -49,358 +49,369 @@
 import io.restassured.response.Response;
 import io.restassured.specification.RequestSpecification;
 
-
 /**
- * A supporting base class that sets up a common test fixture. These configuration methods are invoked before those
- * defined in a subclass.
+ * A supporting base class that sets up a common test fixture. These configuration methods
+ * are invoked before those defined in a subclass.
  */
 public class CommonFixture {
 
-    private ByteArrayOutputStream requestOutputStream = new ByteArrayOutputStream();
-
-    private ByteArrayOutputStream responseOutputStream = new ByteArrayOutputStream();
-
-    protected RequestLoggingFilter requestLoggingFilter;
-
-    protected ResponseLoggingFilter responseLoggingFilter;
-    
-    protected URL specURL;
-
-    protected URI rootUri;
-    
-    protected int limit = 0;
-    
-    protected boolean testAllProcesses = false;
-    
-    /** A String representing the request. */
-    protected HttpRequest reqEntity;
-    /** An Object representing the content of the response message. */
-    protected Object rspEntity;
-    
-    protected final String CONTENT_TYPE = "Content-Type";
-    
-    protected final String CONTENT_MEDIA_TYPE_PROPERTY_KEY = "contentMediaType";
-    
-    protected final String CONTENT_SCHEMA_PROPERTY_KEY = "contentSchema";
-    
-    protected final String CONTENT_ENCODING_PROPERTY_KEY = "contentEncoding";
-    
-    private static final int MAX_RSP_ATTR_LENGTH = 4096;
-    
-    private static final String REQ_ATTR = "request";
-    
-    private static final String REQ_POST_ATTR = "post-request";
-    
-    private static final String RSP_ATTR = "response";
-
-    /**
-     * Initializes the common test fixture with a client component for interacting with HTTP endpoints.
-     *
-     * @param testContext
-     *            The test context that contains all the information for a test run, including suite attributes.
-     */
-    @BeforeClass
-    public void initCommonFixture( ITestContext testContext ) {
-        initLogging();
-        rootUri = (URI) testContext.getSuite().getAttribute( SuiteAttribute.IUT.getName() );
-        limit = (Integer) testContext.getSuite().getAttribute( SuiteAttribute.PROCESS_TEST_LIMIT.getName() );
-        boolean useLocalSchema = (boolean) testContext.getSuite().getAttribute( SuiteAttribute.USE_LOCAL_SCHEMA.getName() );
-        if(useLocalSchema) {
-            specURL = getClass().getResource("/org/opengis/cite/ogcapiprocesses10/openapi/api-processes10.yaml");
-        } else {
-            try {
-                specURL = new URI("https://developer.ogc.org/api/processes/openapi.yaml").toURL();
-            } catch (MalformedURLException | URISyntaxException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @BeforeMethod
-    public void clearMessages() {
-        initLogging();
-    }
-
-    public String getRequest() {
-        return requestOutputStream.toString();
-    }
-
-    public String getResponse() {
-        return responseOutputStream.toString();
-    }
-
-    protected RequestSpecification init() {
-        return given().filters( requestLoggingFilter, responseLoggingFilter ).log().all();
-    }
-
-    /**
-     * Obtains the (XML) response entity as a DOM Document. This convenience method wraps a static method call to
-     * facilitate unit testing (Mockito workaround).
-     *
-     * @param response
-     *            A representation of an HTTP response message.
-     * @param targetURI
-     *            The target URI from which the entity was retrieved (may be null).
-     * @return A Document representing the entity.
-     *
-     * @see ClientUtils#getResponseEntityAsDocument public Document getResponseEntityAsDocument( ClientResponse
-     *      response, String targetURI ) { return ClientUtils.getResponseEntityAsDocument( response, targetURI ); }
-     */
-
-    /**
-     * Builds an HTTP request message that uses the GET method. This convenience method wraps a static method call to
-     * facilitate unit testing (Mockito workaround).
-     *
-     * @return A ClientRequest object.
-     *
-     * @see ClientUtils#buildGetRequest public ClientRequest buildGetRequest( URI endpoint, Map String, String 
-     *      qryParams, MediaType... mediaTypes ) { return ClientUtils.buildGetRequest( endpoint, qryParams, mediaTypes
-     *      ); }
-     */
-
-
-    /**
-     * 
-     */
-    protected boolean validateResponseAgainstSchema(String urlSchema,String body){
-	ObjectMapper objMapper =new ObjectMapper(new YAMLFactory());
-	JsonSchemaFactory factory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7)).objectMapper(objMapper).build();
-	SchemaValidatorsConfig config = new SchemaValidatorsConfig();
-	config.setTypeLoose(false);
-	try{
-	    JsonSchema jsonSchema = factory.getSchema(new URI(urlSchema), config);
-	    ObjectMapper objectMapper =new ObjectMapper();
-	    JsonNode json = objectMapper.readTree(body);
-	    Set<ValidationMessage> validationResult = jsonSchema.validate(json);
-	    if (validationResult.isEmpty()) {
-		System.out.println("no validation errors :-)");
-		return true;
-	    } else {
-		validationResult.forEach(vm -> System.out.println(vm.getMessage()));
-		return false;
-	    }
-	} catch (Exception e) {
-	    e.printStackTrace();
-	    return false;
+	private ByteArrayOutputStream requestOutputStream = new ByteArrayOutputStream();
+
+	private ByteArrayOutputStream responseOutputStream = new ByteArrayOutputStream();
+
+	protected RequestLoggingFilter requestLoggingFilter;
+
+	protected ResponseLoggingFilter responseLoggingFilter;
+
+	protected URL specURL;
+
+	protected URI rootUri;
+
+	protected int limit = 0;
+
+	protected boolean testAllProcesses = false;
+
+	/** A String representing the request. */
+	protected HttpRequest reqEntity;
+
+	/** An Object representing the content of the response message. */
+	protected Object rspEntity;
+
+	protected final String CONTENT_TYPE = "Content-Type";
+
+	protected final String CONTENT_MEDIA_TYPE_PROPERTY_KEY = "contentMediaType";
+
+	protected final String CONTENT_SCHEMA_PROPERTY_KEY = "contentSchema";
+
+	protected final String CONTENT_ENCODING_PROPERTY_KEY = "contentEncoding";
+
+	private static final int MAX_RSP_ATTR_LENGTH = 4096;
+
+	private static final String REQ_ATTR = "request";
+
+	private static final String REQ_POST_ATTR = "post-request";
+
+	private static final String RSP_ATTR = "response";
+
+	/**
+	 * Initializes the common test fixture with a client component for interacting with
+	 * HTTP endpoints.
+	 * @param testContext The test context that contains all the information for a test
+	 * run, including suite attributes.
+	 */
+	@BeforeClass
+	public void initCommonFixture(ITestContext testContext) {
+		initLogging();
+		rootUri = (URI) testContext.getSuite().getAttribute(SuiteAttribute.IUT.getName());
+		limit = (Integer) testContext.getSuite().getAttribute(SuiteAttribute.PROCESS_TEST_LIMIT.getName());
+		boolean useLocalSchema = (boolean) testContext.getSuite()
+				.getAttribute(SuiteAttribute.USE_LOCAL_SCHEMA.getName());
+		if (useLocalSchema) {
+			specURL = getClass().getResource("/org/opengis/cite/ogcapiprocesses10/openapi/api-processes10.yaml");
+		}
+		else {
+			try {
+				specURL = new URI("https://developer.ogc.org/api/processes/openapi.yaml").toURL();
+			}
+			catch (MalformedURLException | URISyntaxException e) {
+				e.printStackTrace();
+			}
+		}
 	}
-    }
-
-    /**
-     * Try to implement testing for A.5. Conformance Class HTML
-     * TODO: Abtract Test 56: /conf/html/content 
-     * Abtract Test 57: /conf/html/definition
-     */
-    protected void checkHtmlConfClass(String uri){
-	Response request = init().baseUri( uri ).accept( HTML ).when().request( GET );
-        //TestSuiteLogger.log(Level.INFO, rootUri.toString());
-        request.then().statusCode( 200 );
-	String headerValue = request.getHeader("Content-Type");
-	System.out.println("Content-type header fecthed: "+headerValue);
-	if(headerValue.indexOf("text/html")<0)
-	    throw new AssertionError( "The Content-type header should be text/html but '"
-				     + headerValue
-				     + "' has been found" );
-	String bodyHTML = request.getBody().asString();
-    }
-
-    
-    private void initLogging() {
-        this.requestOutputStream = new ByteArrayOutputStream();
-        this.responseOutputStream = new ByteArrayOutputStream();
-        PrintStream requestPrintStream = new PrintStream( requestOutputStream, true );
-        PrintStream responsePrintStream = new PrintStream( responseOutputStream, true );
-        requestLoggingFilter = new RequestLoggingFilter( requestPrintStream );
-        responseLoggingFilter = new ResponseLoggingFilter( responsePrintStream );
-    }
-    
-    protected String printResults(ValidationResults validationResults) {    	
-    	List<ValidationItem> validationItems = validationResults.items();    	
-    	StringBuilder printedResultsStringBuilder = new StringBuilder();    	
-    	for (ValidationItem validationItem : validationItems) {
+
+	@BeforeMethod
+	public void clearMessages() {
+		initLogging();
+	}
+
+	public String getRequest() {
+		return requestOutputStream.toString();
+	}
+
+	public String getResponse() {
+		return responseOutputStream.toString();
+	}
+
+	protected RequestSpecification init() {
+		return given().filters(requestLoggingFilter, responseLoggingFilter).log().all();
+	}
+
+	/**
+	 * Obtains the (XML) response entity as a DOM Document. This convenience method wraps
+	 * a static method call to facilitate unit testing (Mockito workaround).
+	 * @param response A representation of an HTTP response message.
+	 * @param targetURI The target URI from which the entity was retrieved (may be null).
+	 * @return A Document representing the entity.
+	 *
+	 * @see ClientUtils#getResponseEntityAsDocument public Document
+	 * getResponseEntityAsDocument( ClientResponse response, String targetURI ) { return
+	 * ClientUtils.getResponseEntityAsDocument( response, targetURI ); }
+	 */
+
+	/**
+	 * Builds an HTTP request message that uses the GET method. This convenience method
+	 * wraps a static method call to facilitate unit testing (Mockito workaround).
+	 * @return A ClientRequest object.
+	 *
+	 * @see ClientUtils#buildGetRequest public ClientRequest buildGetRequest( URI
+	 * endpoint, Map String, String qryParams, MediaType... mediaTypes ) { return
+	 * ClientUtils.buildGetRequest( endpoint, qryParams, mediaTypes ); }
+	 */
+
+	/**
+	 *
+	 */
+	protected boolean validateResponseAgainstSchema(String urlSchema, String body) {
+		ObjectMapper objMapper = new ObjectMapper(new YAMLFactory());
+		JsonSchemaFactory factory = JsonSchemaFactory.builder(JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V7))
+				.objectMapper(objMapper).build();
+		SchemaValidatorsConfig config = new SchemaValidatorsConfig();
+		config.setTypeLoose(false);
+		try {
+			JsonSchema jsonSchema = factory.getSchema(new URI(urlSchema), config);
+			ObjectMapper objectMapper = new ObjectMapper();
+			JsonNode json = objectMapper.readTree(body);
+			Set<ValidationMessage> validationResult = jsonSchema.validate(json);
+			if (validationResult.isEmpty()) {
+				System.out.println("no validation errors :-)");
+				return true;
+			}
+			else {
+				validationResult.forEach(vm -> System.out.println(vm.getMessage()));
+				return false;
+			}
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	/**
+	 * Try to implement testing for A.5. Conformance Class HTML TODO: Abtract Test 56:
+	 * /conf/html/content Abtract Test 57: /conf/html/definition
+	 */
+	protected void checkHtmlConfClass(String uri) {
+		Response request = init().baseUri(uri).accept(HTML).when().request(GET);
+		// TestSuiteLogger.log(Level.INFO, rootUri.toString());
+		request.then().statusCode(200);
+		String headerValue = request.getHeader("Content-Type");
+		System.out.println("Content-type header fecthed: " + headerValue);
+		if (headerValue.indexOf("text/html") < 0)
+			throw new AssertionError(
+					"The Content-type header should be text/html but '" + headerValue + "' has been found");
+		String bodyHTML = request.getBody().asString();
+	}
+
+	private void initLogging() {
+		this.requestOutputStream = new ByteArrayOutputStream();
+		this.responseOutputStream = new ByteArrayOutputStream();
+		PrintStream requestPrintStream = new PrintStream(requestOutputStream, true);
+		PrintStream responsePrintStream = new PrintStream(responseOutputStream, true);
+		requestLoggingFilter = new RequestLoggingFilter(requestPrintStream);
+		responseLoggingFilter = new ResponseLoggingFilter(responsePrintStream);
+	}
+
+	protected String printResults(ValidationResults validationResults) {
+		List<ValidationItem> validationItems = validationResults.items();
+		StringBuilder printedResultsStringBuilder = new StringBuilder();
+		for (ValidationItem validationItem : validationItems) {
 			printedResultsStringBuilder.append(validationItem + "\n");
-		}    	
-    	return printedResultsStringBuilder.toString();
-    }
-    
-    protected void addServerUnderTest(OpenApi3 openApi3) {
+		}
+		return printedResultsStringBuilder.toString();
+	}
+
+	protected void addServerUnderTest(OpenApi3 openApi3) {
 		Server serverUnderTest = new Server();
 		String authority = rootUri.getAuthority();
 		String scheme = rootUri.getScheme();
 		serverUnderTest.setUrl(scheme + "://" + authority);
 		openApi3.addServer(serverUnderTest);
 	}
-	
-    protected Input createInput(JsonNode schemaNode, String id) {
-	Input input = new Input(id);
-	JsonNode typeNode = schemaNode.get("type");
-	if(typeNode != null) {
-	    String typeDefinition = typeNode.asText();
-	    Type type = new Type(typeDefinition);
-	    if(typeDefinition.equals("object")) {
-		JsonNode propertiesNode = schemaNode.get("properties");
-		if(propertiesNode != null) {
-		    Iterator<String> propertyNames = propertiesNode.fieldNames();
-		    while (propertyNames.hasNext()) {
-			String propertyName = (String) propertyNames.next();
-			if(propertyName.equals("bbox")) {
-			    input.setBbox(true);
-			    break;
+
+	protected Input createInput(JsonNode schemaNode, String id) {
+		Input input = new Input(id);
+		JsonNode typeNode = schemaNode.get("type");
+		if (typeNode != null) {
+			String typeDefinition = typeNode.asText();
+			Type type = new Type(typeDefinition);
+			if (typeDefinition.equals("object")) {
+				JsonNode propertiesNode = schemaNode.get("properties");
+				if (propertiesNode != null) {
+					Iterator<String> propertyNames = propertiesNode.fieldNames();
+					while (propertyNames.hasNext()) {
+						String propertyName = (String) propertyNames.next();
+						if (propertyName.equals("bbox")) {
+							input.setBbox(true);
+							break;
+						}
+					}
+				}
 			}
-		    }
-		}
-	    } else if(typeDefinition.equals("string")) {
-		JsonNode formatNode = schemaNode.get("format");
-		if(formatNode != null) {
-		    String format  = formatNode.asText();
-		    input.setFormat(format);
-		    if(format.equals("byte")) {
-			type.setBinary(true);
-		    }
-		}
-                JsonNode contentMediaTypeNode = schemaNode.get(CONTENT_MEDIA_TYPE_PROPERTY_KEY);
-                if(contentMediaTypeNode != null && !contentMediaTypeNode.isMissingNode()) {
-                    type.setContentMediaType(contentMediaTypeNode.asText());
-                }
-                JsonNode contentEncodingNode = schemaNode.get(CONTENT_ENCODING_PROPERTY_KEY);
-                if(contentEncodingNode != null && !contentEncodingNode.isMissingNode()) {
-                    String contentEncodingNodeText = contentEncodingNode.asText();
-                    if(contentEncodingNodeText.equals("binary")) {
-                        type.setBinary(true);
-                    }
-                    type.setContentEncoding(contentEncodingNodeText);
-                }
-                JsonNode contentSchemaNode = schemaNode.get(CONTENT_SCHEMA_PROPERTY_KEY);
-                if(contentSchemaNode != null && !contentSchemaNode.isMissingNode()) {
-                    type.setContentSchema(contentSchemaNode.asText());
-                }
-	    } else if (typeDefinition.equals("array")) {
-	        JsonNode itemsNode = schemaNode.get("items");
-	        if(itemsNode != null) {
-	            JsonNode itemsTypeNode = itemsNode.get("type");
-	            if(itemsTypeNode != null) {
-	                Type itemsType = new Type(itemsTypeNode.asText());
-	                input.addType(itemsType);
-	            }
-	        }
-	    }
-	    input.addType(type);
-	}else {
-	    //oneOf, allOf, anyOf
-	    JsonNode oneOfNode = schemaNode.get("oneOf");
-	    if(oneOfNode != null) {
-		if(oneOfNode instanceof ArrayNode) {
-		    ArrayNode oneOfArrayNode = (ArrayNode)oneOfNode;
-		    for (int i = 0; i < oneOfArrayNode.size(); i++) {
-			JsonNode oneOfChildNode = oneOfArrayNode.get(i);		
-			JsonNode oneOfTypeNode = oneOfChildNode.get("type");
-			if(oneOfTypeNode != null) {							
-			    String typeDefinition = oneOfTypeNode.asText();
-			    Type type = new Type(typeDefinition);
-			    if(typeDefinition.equals("object")) {
-				JsonNode propertiesNode = oneOfChildNode.get("properties");
-				if(propertiesNode != null) {
-				    Iterator<String> propertyNames = propertiesNode.fieldNames();
-				    while (propertyNames.hasNext()) {
-					String propertyName = (String) propertyNames.next();
-					if(propertyName.equals("bbox")) {
-					    input.setBbox(true);
-					    break;
+			else if (typeDefinition.equals("string")) {
+				JsonNode formatNode = schemaNode.get("format");
+				if (formatNode != null) {
+					String format = formatNode.asText();
+					input.setFormat(format);
+					if (format.equals("byte")) {
+						type.setBinary(true);
 					}
-				    }
 				}
-			    } else if(typeDefinition.equals("string")) {
-				JsonNode formatNode = oneOfChildNode.get("format");
-				if(formatNode != null) {
-				    String format  = formatNode.asText();
-				    if(format.equals("byte")) {
-					type.setBinary(true);
-				    }
+				JsonNode contentMediaTypeNode = schemaNode.get(CONTENT_MEDIA_TYPE_PROPERTY_KEY);
+				if (contentMediaTypeNode != null && !contentMediaTypeNode.isMissingNode()) {
+					type.setContentMediaType(contentMediaTypeNode.asText());
+				}
+				JsonNode contentEncodingNode = schemaNode.get(CONTENT_ENCODING_PROPERTY_KEY);
+				if (contentEncodingNode != null && !contentEncodingNode.isMissingNode()) {
+					String contentEncodingNodeText = contentEncodingNode.asText();
+					if (contentEncodingNodeText.equals("binary")) {
+						type.setBinary(true);
+					}
+					type.setContentEncoding(contentEncodingNodeText);
 				}
-				JsonNode contentMediaTypeNode = oneOfChildNode.get(CONTENT_MEDIA_TYPE_PROPERTY_KEY);
-				if(contentMediaTypeNode != null && !contentMediaTypeNode.isMissingNode()) {
-				    type.setContentMediaType(contentMediaTypeNode.asText());
+				JsonNode contentSchemaNode = schemaNode.get(CONTENT_SCHEMA_PROPERTY_KEY);
+				if (contentSchemaNode != null && !contentSchemaNode.isMissingNode()) {
+					type.setContentSchema(contentSchemaNode.asText());
 				}
-				JsonNode contentEncodingNode = oneOfChildNode.get(CONTENT_ENCODING_PROPERTY_KEY);
-				if(contentEncodingNode != null && !contentEncodingNode.isMissingNode()) {
-                                    String contentEncodingNodeText = contentEncodingNode.asText();
-                                    if(contentEncodingNodeText.equals("binary")) {
-                                        type.setBinary(true);
-                                    }
-				    type.setContentEncoding(contentEncodingNodeText);
+			}
+			else if (typeDefinition.equals("array")) {
+				JsonNode itemsNode = schemaNode.get("items");
+				if (itemsNode != null) {
+					JsonNode itemsTypeNode = itemsNode.get("type");
+					if (itemsTypeNode != null) {
+						Type itemsType = new Type(itemsTypeNode.asText());
+						input.addType(itemsType);
+					}
 				}
-				JsonNode contentSchemaNode = oneOfChildNode.get(CONTENT_SCHEMA_PROPERTY_KEY);
-				if(contentSchemaNode != null && !contentSchemaNode.isMissingNode()) {
-				    type.setContentSchema(contentSchemaNode.asText());
+			}
+			input.addType(type);
+		}
+		else {
+			// oneOf, allOf, anyOf
+			JsonNode oneOfNode = schemaNode.get("oneOf");
+			if (oneOfNode != null) {
+				if (oneOfNode instanceof ArrayNode) {
+					ArrayNode oneOfArrayNode = (ArrayNode) oneOfNode;
+					for (int i = 0; i < oneOfArrayNode.size(); i++) {
+						JsonNode oneOfChildNode = oneOfArrayNode.get(i);
+						JsonNode oneOfTypeNode = oneOfChildNode.get("type");
+						if (oneOfTypeNode != null) {
+							String typeDefinition = oneOfTypeNode.asText();
+							Type type = new Type(typeDefinition);
+							if (typeDefinition.equals("object")) {
+								JsonNode propertiesNode = oneOfChildNode.get("properties");
+								if (propertiesNode != null) {
+									Iterator<String> propertyNames = propertiesNode.fieldNames();
+									while (propertyNames.hasNext()) {
+										String propertyName = (String) propertyNames.next();
+										if (propertyName.equals("bbox")) {
+											input.setBbox(true);
+											break;
+										}
+									}
+								}
+							}
+							else if (typeDefinition.equals("string")) {
+								JsonNode formatNode = oneOfChildNode.get("format");
+								if (formatNode != null) {
+									String format = formatNode.asText();
+									if (format.equals("byte")) {
+										type.setBinary(true);
+									}
+								}
+								JsonNode contentMediaTypeNode = oneOfChildNode.get(CONTENT_MEDIA_TYPE_PROPERTY_KEY);
+								if (contentMediaTypeNode != null && !contentMediaTypeNode.isMissingNode()) {
+									type.setContentMediaType(contentMediaTypeNode.asText());
+								}
+								JsonNode contentEncodingNode = oneOfChildNode.get(CONTENT_ENCODING_PROPERTY_KEY);
+								if (contentEncodingNode != null && !contentEncodingNode.isMissingNode()) {
+									String contentEncodingNodeText = contentEncodingNode.asText();
+									if (contentEncodingNodeText.equals("binary")) {
+										type.setBinary(true);
+									}
+									type.setContentEncoding(contentEncodingNodeText);
+								}
+								JsonNode contentSchemaNode = oneOfChildNode.get(CONTENT_SCHEMA_PROPERTY_KEY);
+								if (contentSchemaNode != null && !contentSchemaNode.isMissingNode()) {
+									type.setContentSchema(contentSchemaNode.asText());
+								}
+							}
+							else if (typeDefinition.equals("array")) {
+								JsonNode itemsNode = oneOfChildNode.get("items");
+								if (itemsNode != null) {
+									JsonNode itemsTypeNode = itemsNode.get("type");
+									if (itemsTypeNode != null) {
+										Type itemsType = new Type(itemsTypeNode.asText());
+										input.addType(itemsType);
+									}
+								}
+							}
+							input.addType(type);
+						}
+					}
+				}
+			}
+			else {
+				if (checkAllOfForBbox(schemaNode)) {
+					input.setBbox(true);
+				}
+			}
+		}
+		return input;
+	}
+
+	private boolean checkAllOfForBbox(JsonNode schemaNode) {
+		JsonNode allOfNode = schemaNode.get("allOf");
+		if (allOfNode != null) {
+			if (allOfNode instanceof ArrayNode) {
+				for (JsonNode jsonNode : allOfNode) {
+					JsonNode formatNode = jsonNode.get("format");
+					String format = formatNode.asText();
+					if (format.equals("ogc-bbox")) {
+						return true;
+					}
 				}
-			    } else if (typeDefinition.equals("array")) {
-		                JsonNode itemsNode = oneOfChildNode.get("items");
-		                if(itemsNode != null) {
-		                    JsonNode itemsTypeNode = itemsNode.get("type");
-		                    if(itemsTypeNode != null) {
-		                        Type itemsType = new Type(itemsTypeNode.asText());
-		                        input.addType(itemsType);
-		                    }
-		                }
-		            }
-			    input.addType(type);							
 			}
-		    }
-		}
-	    }else {
-	            if(checkAllOfForBbox(schemaNode)) {
-                        input.setBbox(true);
-	            }
-	    }
-	}		
-	return input;
-    }
-	
-    private boolean checkAllOfForBbox(JsonNode schemaNode) {
-        JsonNode allOfNode = schemaNode.get("allOf");
-        if(allOfNode != null) {
-            if(allOfNode instanceof ArrayNode) {
-                for (JsonNode jsonNode : allOfNode) {
-                    JsonNode formatNode = jsonNode.get("format");
-                    String format  = formatNode.asText();
-                    if(format.equals("ogc-bbox")) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    protected Output createOutput(JsonNode schemaNode, String id) {
+		}
+		return false;
+	}
+
+	protected Output createOutput(JsonNode schemaNode, String id) {
 		Output output = new Output(id);
-	        JsonNode typeNode = schemaNode.get("type");
-	        if(typeNode != null) {
-	            String typeDefinition = typeNode.asText();
-	            if (typeDefinition.equals("array")) {
-                        Type itemsType = new Type(typeDefinition);
-                        output.addType(itemsType);
-	            }
-	        } else {
-	                if(checkAllOfForBbox(schemaNode)) {
-	                    output.setBbox(true);
-	                }	            
-	        }
+		JsonNode typeNode = schemaNode.get("type");
+		if (typeNode != null) {
+			String typeDefinition = typeNode.asText();
+			if (typeDefinition.equals("array")) {
+				Type itemsType = new Type(typeDefinition);
+				output.addType(itemsType);
+			}
+		}
+		else {
+			if (checkAllOfForBbox(schemaNode)) {
+				output.setBbox(true);
+			}
+		}
 		return output;
 	}
-	
+
 	public class Type {
-		
+
 		private String typeDefinition;
+
 		private String contentEncoding;
+
 		private String contentMediaType;
+
 		private String contentSchema;
+
 		private boolean isBinary;
+
 		private String format;
 
 		public Type(String typeDefinition) {
 			this.typeDefinition = typeDefinition;
 		}
-		
+
 		public boolean isBinary() {
 			return isBinary;
 		}
@@ -424,12 +435,12 @@ public String getContentMediaType() {
 		public void setContentMediaType(String contentMediaType) {
 			this.contentMediaType = contentMediaType;
 		}
-		
+
 		public void setContentSchema(String schema) {
 			this.contentSchema = schema;
-			
+
 		}
-		
+
 		public String getContentSchema() {
 			return contentSchema;
 		}
@@ -448,28 +459,32 @@ public String toString() {
 			return builder.toString();
 		}
 
-        public String getFormat() {
-            return format;
-        }
+		public String getFormat() {
+			return format;
+		}
+
 	}
 
 	public class Input {
-		
+
 		protected String id;
+
 		protected List<Type> types;
+
 		protected boolean isBbox;
+
 		protected String format;
-		
+
 		public Input(String id, List<Type> types, boolean isBbox) {
 			this.id = id;
 			this.types = types;
 			this.isBbox = isBbox;
 		}
-		
+
 		public Input(String id, Type type) {
-			this(id, Arrays.asList(new Type[] {type}), false);
+			this(id, Arrays.asList(new Type[] { type }), false);
 		}
-		
+
 		public Input(String id) {
 			this(id, new ArrayList<Type>(), false);
 		}
@@ -485,24 +500,24 @@ public void setBbox(boolean isBbox) {
 		public String getId() {
 			return id;
 		}
-		
+
 		public List<Type> getTypes() {
 			return types;
 		}
-		
+
 		public boolean addType(Type type) {
 			return types.add(type);
 		}
 
 		public String getFormat() {
-            return format;
-        }
+			return format;
+		}
 
-        public void setFormat(String format) {
-            this.format = format;
-        }
+		public void setFormat(String format) {
+			this.format = format;
+		}
 
-        @Override
+		@Override
 		public String toString() {
 			StringBuilder builder = new StringBuilder();
 			builder.append("Id: " + id + "\n");
@@ -510,33 +525,35 @@ public String toString() {
 			builder.append("\tIs bbox: " + isBbox);
 			return builder.toString();
 		}
-		
+
 	}
 
 	public class Output {
-		
+
 		private String id;
+
 		private List<Type> types;
+
 		private boolean bbox;
-		
+
 		public Output(String id) {
 			this.id = id;
 			this.types = new ArrayList<CommonFixture.Type>();
 		}
 
 		public void addType(Type itemsType) {
-                    types.add(itemsType);            
-              }
+			types.add(itemsType);
+		}
+
+		public void setBbox(boolean b) {
+			bbox = true;
+		}
 
-        public void setBbox(boolean b) {
-		    bbox = true;
-                }
-		
 		public boolean isBbox() {
-		    return bbox;
+			return bbox;
 		}
 
-        public String getId() {
+		public String getId() {
 			return id;
 		}
 
@@ -559,66 +576,68 @@ public String toString() {
 			builder.append("\tType: " + types + "\n");
 			return builder.toString();
 		}
-		
+
 	}
 
-    /**
-     * Augments the test result with supplementary attributes in the event that
-     * a test method failed. The "request" attribute contains a String
-     * representing the request entity (POST method) or query component (GET
-     * method). The "response" attribute contains the content of the response
-     * entity.
-     * 
-     * @param result
-     *            A description of the test result.
-     */
-    @AfterMethod
-    public void addAttributesOnTestFailure(ITestResult result) {
-        if (result.getStatus() != ITestResult.FAILURE) {
-            return;
-        }
-        if (null != this.reqEntity) {
-            result.setAttribute(REQ_ATTR, this.reqEntity.toString());
-        }
-        if (null != this.reqEntity) {
-            String request = "";
-            if (this.reqEntity instanceof HttpGet) {
-                request = this.reqEntity.toString();
-            } else {
-                // https://github.com/opengeospatial/ets-ogcapi-processes10/issues/51
-                try {
-                    HttpPost postRequest = (HttpPost)this.reqEntity;
-                    result.setAttribute(REQ_POST_ATTR, postRequest.toString());
-                    request = JsonUtils.inputStreamToString(postRequest.getEntity().getContent());
-                    // we have to add a "<" at the start, because this is used by TEAM Engine EarlReporter 
-                    // to differentiate between GET and POST. 
-                    request = "<!-- non XML body -->\n" + request;
-                } catch (Exception e) {
-                    TestSuiteLogger.log(Level.WARNING, "Could not get POST endpoint URI.", e);
-                }
-            }
-            result.setAttribute(REQ_ATTR, request);
-        }
-        if (null != this.rspEntity) {
-            StringBuilder response = new StringBuilder();
-            if (this.rspEntity instanceof InputStream) {
-                try {
-                    response = response.append(JsonUtils.inputStreamToString((InputStream) rspEntity));
-                } catch (IOException e) {
-                    TestSuiteLogger.log(Level.WARNING, "Could not write response to String.", e);
-                }
-            } else if(rspEntity instanceof String) {
-                response = response.append((String)rspEntity);
-            }
-            String responseString = JsonUtils.prettifyString(response.toString());
-            if (response.length() > MAX_RSP_ATTR_LENGTH) {
-                response = new StringBuilder();
-                response.append(responseString);
-                response.delete(MAX_RSP_ATTR_LENGTH, response.length());
-                responseString = response.toString();
-            }
-            result.setAttribute(RSP_ATTR, responseString);
-        }
-    }
+	/**
+	 * Augments the test result with supplementary attributes in the event that a test
+	 * method failed. The "request" attribute contains a String representing the request
+	 * entity (POST method) or query component (GET method). The "response" attribute
+	 * contains the content of the response entity.
+	 * @param result A description of the test result.
+	 */
+	@AfterMethod
+	public void addAttributesOnTestFailure(ITestResult result) {
+		if (result.getStatus() != ITestResult.FAILURE) {
+			return;
+		}
+		if (null != this.reqEntity) {
+			result.setAttribute(REQ_ATTR, this.reqEntity.toString());
+		}
+		if (null != this.reqEntity) {
+			String request = "";
+			if (this.reqEntity instanceof HttpGet) {
+				request = this.reqEntity.toString();
+			}
+			else {
+				// https://github.com/opengeospatial/ets-ogcapi-processes10/issues/51
+				try {
+					HttpPost postRequest = (HttpPost) this.reqEntity;
+					result.setAttribute(REQ_POST_ATTR, postRequest.toString());
+					request = JsonUtils.inputStreamToString(postRequest.getEntity().getContent());
+					// we have to add a "<" at the start, because this is used by TEAM
+					// Engine EarlReporter
+					// to differentiate between GET and POST.
+					request = "<!-- non XML body -->\n" + request;
+				}
+				catch (Exception e) {
+					TestSuiteLogger.log(Level.WARNING, "Could not get POST endpoint URI.", e);
+				}
+			}
+			result.setAttribute(REQ_ATTR, request);
+		}
+		if (null != this.rspEntity) {
+			StringBuilder response = new StringBuilder();
+			if (this.rspEntity instanceof InputStream) {
+				try {
+					response = response.append(JsonUtils.inputStreamToString((InputStream) rspEntity));
+				}
+				catch (IOException e) {
+					TestSuiteLogger.log(Level.WARNING, "Could not write response to String.", e);
+				}
+			}
+			else if (rspEntity instanceof String) {
+				response = response.append((String) rspEntity);
+			}
+			String responseString = JsonUtils.prettifyString(response.toString());
+			if (response.length() > MAX_RSP_ATTR_LENGTH) {
+				response = new StringBuilder();
+				response.append(responseString);
+				response.delete(MAX_RSP_ATTR_LENGTH, response.length());
+				responseString = response.toString();
+			}
+			result.setAttribute(RSP_ATTR, responseString);
+		}
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessage.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessage.java
index e3e530f..28265bf 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessage.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessage.java
@@ -4,46 +4,39 @@
 import java.util.ResourceBundle;
 
 /**
- * Utility class for retrieving and formatting localized error messages that
- * describe failed assertions.
+ * Utility class for retrieving and formatting localized error messages that describe
+ * failed assertions.
  */
 public class ErrorMessage {
 
-    private static final String BASE_NAME =
-            "org.opengis.cite.ogcapiprocesses10.MessageBundle";
-    private static ResourceBundle msgResources =
-            ResourceBundle.getBundle(BASE_NAME);
+	private static final String BASE_NAME = "org.opengis.cite.ogcapiprocesses10.MessageBundle";
 
-    /**
-     * Produces a formatted error message using the supplied substitution
-     * arguments and the current locale. The arguments should reflect the order
-     * of the placeholders in the message template.
-     *
-     * @param msgKey
-     *            The key identifying the message template; it should be a
-     *            member of {@code ErrorMessageKeys}.
-     * @param args
-     *            An array of arguments to be formatted and substituted in the
-     *            content of the message.
-     * @return A String containing the message content. If no message is found
-     *         for the given key, a {@link java.util.MissingResourceException}
-     *         is thrown.
-     */
-    public static String format(String msgKey, Object... args) {
-        return MessageFormat.format(msgResources.getString(msgKey), args);
-    }
+	private static ResourceBundle msgResources = ResourceBundle.getBundle(BASE_NAME);
+
+	/**
+	 * Produces a formatted error message using the supplied substitution arguments and
+	 * the current locale. The arguments should reflect the order of the placeholders in
+	 * the message template.
+	 * @param msgKey The key identifying the message template; it should be a member of
+	 * {@code ErrorMessageKeys}.
+	 * @param args An array of arguments to be formatted and substituted in the content of
+	 * the message.
+	 * @return A String containing the message content. If no message is found for the
+	 * given key, a {@link java.util.MissingResourceException} is thrown.
+	 */
+	public static String format(String msgKey, Object... args) {
+		return MessageFormat.format(msgResources.getString(msgKey), args);
+	}
+
+	/**
+	 * Retrieves a simple message according to the current locale.
+	 * @param msgKey The key identifying the message; it should be a member of
+	 * {@code ErrorMessageKeys}.
+	 * @return A String containing the message content. If no message is found for the
+	 * given key, a {@link java.util.MissingResourceException} is thrown.
+	 */
+	public static String get(String msgKey) {
+		return msgResources.getString(msgKey);
+	}
 
-    /**
-     * Retrieves a simple message according to the current locale.
-     *
-     * @param msgKey
-     *            The key identifying the message; it should be a member of
-     *            {@code ErrorMessageKeys}.
-     * @return A String containing the message content. If no message is found
-     *         for the given key, a {@link java.util.MissingResourceException}
-     *         is thrown.
-     */
-    public static String get(String msgKey) {
-        return msgResources.getString(msgKey);
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessageKeys.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessageKeys.java
index ee0cf1b..9d81194 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessageKeys.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/ErrorMessageKeys.java
@@ -1,22 +1,33 @@
 package org.opengis.cite.ogcapiprocesses10;
 
 /**
- * Defines keys used to access localized messages for assertion errors. The
- * messages are stored in Properties files that are encoded in ISO-8859-1
- * (Latin-1). For some languages the {@code native2ascii} tool must be used to
- * process the files and produce escaped Unicode characters.
+ * Defines keys used to access localized messages for assertion errors. The messages are
+ * stored in Properties files that are encoded in ISO-8859-1 (Latin-1). For some languages
+ * the {@code native2ascii} tool must be used to process the files and produce escaped
+ * Unicode characters.
  */
 public class ErrorMessageKeys {
 
-    public static final String NOT_SCHEMA_VALID = "NotSchemaValid";
-    public static final String EMPTY_STRING = "EmptyString";
-    public static final String XPATH_RESULT = "XPathResult";
-    public static final String NAMESPACE_NAME = "NamespaceName";
-    public static final String LOCAL_NAME = "LocalName";
-    public static final String XML_ERROR = "XMLError";
-    public static final String XPATH_ERROR = "XPathError";
-    public static final String MISSING_INFOSET_ITEM = "MissingInfosetItem";
-    public static final String UNEXPECTED_STATUS = "UnexpectedStatus";
-    public static final String UNEXPECTED_MEDIA_TYPE = "UnexpectedMediaType";
-    public static final String MISSING_ENTITY = "MissingEntity";
+	public static final String NOT_SCHEMA_VALID = "NotSchemaValid";
+
+	public static final String EMPTY_STRING = "EmptyString";
+
+	public static final String XPATH_RESULT = "XPathResult";
+
+	public static final String NAMESPACE_NAME = "NamespaceName";
+
+	public static final String LOCAL_NAME = "LocalName";
+
+	public static final String XML_ERROR = "XMLError";
+
+	public static final String XPATH_ERROR = "XPathError";
+
+	public static final String MISSING_INFOSET_ITEM = "MissingInfosetItem";
+
+	public static final String UNEXPECTED_STATUS = "UnexpectedStatus";
+
+	public static final String UNEXPECTED_MEDIA_TYPE = "UnexpectedMediaType";
+
+	public static final String MISSING_ENTITY = "MissingEntity";
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/EtsAssert.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/EtsAssert.java
index 19ab078..dca2644 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/EtsAssert.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/EtsAssert.java
@@ -7,26 +7,24 @@
  */
 public class EtsAssert {
 
-    /**
-     * @param valueToAssert
-     *            the boolean to assert to be <code>true</code>
-     * @param failureMsg
-     *            the message to throw in case of a failure, should not be <code>null</code>
-     */
-    public static void assertTrue( boolean valueToAssert, String failureMsg ) {
-        if ( !valueToAssert )
-            throw new AssertionError( failureMsg );
-    }
+	/**
+	 * @param valueToAssert the boolean to assert to be <code>true</code>
+	 * @param failureMsg the message to throw in case of a failure, should not be
+	 * <code>null</code>
+	 */
+	public static void assertTrue(boolean valueToAssert, String failureMsg) {
+		if (!valueToAssert)
+			throw new AssertionError(failureMsg);
+	}
 
-    /**
-     * @param valueToAssert
-     *            the boolean to assert to be <code>false</code>
-     * @param failureMsg
-     *            the message to throw in case of a failure, should not be <code>null</code>
-     */
-    public static void assertFalse( boolean valueToAssert, String failureMsg ) {
-        if ( valueToAssert )
-            throw new AssertionError( failureMsg );
-    }
+	/**
+	 * @param valueToAssert the boolean to assert to be <code>false</code>
+	 * @param failureMsg the message to throw in case of a failure, should not be
+	 * <code>null</code>
+	 */
+	public static void assertFalse(boolean valueToAssert, String failureMsg) {
+		if (valueToAssert)
+			throw new AssertionError(failureMsg);
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/Namespaces.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/Namespaces.java
index e64174e..9ed7a57 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/Namespaces.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/Namespaces.java
@@ -10,22 +10,25 @@
  */
 public class Namespaces {
 
-    private Namespaces() {
-    }
-
-    /** SOAP 1.2 message envelopes. */
-    public static final String SOAP_ENV = "http://www.w3.org/2003/05/soap-envelope";
-    /** W3C XLink */
-    public static final String XLINK = "http://www.w3.org/1999/xlink";
-    /** OGC 06-121r3 (OWS 1.1) */
-    public static final String OWS = "http://www.opengis.net/ows/1.1";
-    /** ISO 19136 (GML 3.2) */
-    public static final String GML = "http://www.opengis.net/gml/3.2";
-    /** W3C XML Schema namespace */
-    public static final URI XSD = URI
-            .create("http://www.w3.org/2001/XMLSchema");
-    /** Schematron (ISO 19757-3) namespace */
-    public static final URI SCH = URI
-            .create("http://purl.oclc.org/dsdl/schematron");
+	private Namespaces() {
+	}
+
+	/** SOAP 1.2 message envelopes. */
+	public static final String SOAP_ENV = "http://www.w3.org/2003/05/soap-envelope";
+
+	/** W3C XLink */
+	public static final String XLINK = "http://www.w3.org/1999/xlink";
+
+	/** OGC 06-121r3 (OWS 1.1) */
+	public static final String OWS = "http://www.opengis.net/ows/1.1";
+
+	/** ISO 19136 (GML 3.2) */
+	public static final String GML = "http://www.opengis.net/gml/3.2";
+
+	/** W3C XML Schema namespace */
+	public static final URI XSD = URI.create("http://www.w3.org/2001/XMLSchema");
+
+	/** Schematron (ISO 19757-3) namespace */
+	public static final URI SCH = URI.create("http://purl.oclc.org/dsdl/schematron");
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/OgcApiProcesses10.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/OgcApiProcesses10.java
index 2cbc8c9..8e58fb0 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/OgcApiProcesses10.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/OgcApiProcesses10.java
@@ -7,11 +7,11 @@
  */
 public class OgcApiProcesses10 {
 
-    private OgcApiProcesses10() {
-    }
+	private OgcApiProcesses10() {
+	}
 
-    public static final String OPEN_API_MIME_TYPE = "application/vnd.oai.openapi+json;version=3.0";
+	public static final String OPEN_API_MIME_TYPE = "application/vnd.oai.openapi+json;version=3.0";
 
-    public static final String GEOJSON_MIME_TYPE = "application/geo+json";
+	public static final String GEOJSON_MIME_TYPE = "application/geo+json";
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/ReusableEntityFilter.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/ReusableEntityFilter.java
index cc85b25..896f355 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/ReusableEntityFilter.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/ReusableEntityFilter.java
@@ -8,19 +8,20 @@
 /**
  * Buffers the (response) entity so it can be read multiple times.
  *
- * <p><strong>WARNING:</strong> The entity InputStream must be reset after each
- * read attempt.</p>
+ * <p>
+ * <strong>WARNING:</strong> The entity InputStream must be reset after each read attempt.
+ * </p>
  */
 public class ReusableEntityFilter extends ClientFilter {
 
-    @Override
-    public ClientResponse handle(ClientRequest req) throws ClientHandlerException {
-        // leave request entity--it can usually be read multiple times
-        ClientResponse rsp = getNext().handle(req);
-        if (rsp.hasEntity()) {
-            rsp.bufferEntity();
-        }
-        return rsp;
-    }
+	@Override
+	public ClientResponse handle(ClientRequest req) throws ClientHandlerException {
+		// leave request entity--it can usually be read multiple times
+		ClientResponse rsp = getNext().handle(req);
+		if (rsp.hasEntity()) {
+			rsp.bufferEntity();
+		}
+		return rsp;
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteAttribute.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteAttribute.java
index bea0366..e8430ee 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteAttribute.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteAttribute.java
@@ -9,82 +9,86 @@
 import com.sun.jersey.api.client.Client;
 
 /**
- * An enumerated type defining ISuite attributes that may be set to constitute a shared test fixture.
+ * An enumerated type defining ISuite attributes that may be set to constitute a shared
+ * test fixture.
  */
 @SuppressWarnings("rawtypes")
 public enum SuiteAttribute {
 
-    /**
-     * A client component for interacting with HTTP endpoints.
-     */
-    CLIENT( "httpClient", Client.class ),
-
-    /**
-     * The root URL.
-     */
-    IUT( "instanceUnderTest", URI.class ),
-
-    /**
-     * A File containing the test subject or a description of it.
-     */
-    TEST_SUBJ_FILE( "testSubjectFile", File.class ),
-
-    /**
-     * The number of collections to test.
-     */
-    NO_OF_COLLECTIONS( "noOfCollections", Integer.class ),
-    
-    /**
-     * The id of the echo process.
-     */
-    ECHO_PROCESS_ID( "echoProcessId", String.class ),
-    
-    /**
-     * Boolean indicating whether all processes should be tested against the OGC Process Description Conformance Class.
-     */
-    TEST_ALL_PROCESSES( "testAllProcesses", Boolean.class ),
-
-    /**
-     * Number of processes that should be tested against the OGC Process Description Conformance Class.
-     */
-    PROCESS_TEST_LIMIT( "processTestLimit", Integer.class ),
-    
-    /**
-     * Parsed OpenApi3 document resource /api; Added during execution.
-     */
-    API_MODEL( "apiModel", OpenApi3.class ),
-    
-    /**
-     * Use local OpenAPI schema included in ETS.
-     */
-    USE_LOCAL_SCHEMA( "useLocalSchema", Boolean.class ),
-
-    /**
-     * Requirement classes parsed from /conformance; Added during execution.
-     */
-    REQUIREMENTCLASSES( "requirementclasses", List.class );
-
-    private final Class attrType;
-
-    private final String attrName;
-
-    SuiteAttribute( String attrName, Class attrType ) {
-        this.attrName = attrName;
-        this.attrType = attrType;
-    }
-
-    public Class getType() {
-        return attrType;
-    }
-
-    public String getName() {
-        return attrName;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder( attrName );
-        sb.append( '(' ).append( attrType.getName() ).append( ')' );
-        return sb.toString();
-    }
+	/**
+	 * A client component for interacting with HTTP endpoints.
+	 */
+	CLIENT("httpClient", Client.class),
+
+	/**
+	 * The root URL.
+	 */
+	IUT("instanceUnderTest", URI.class),
+
+	/**
+	 * A File containing the test subject or a description of it.
+	 */
+	TEST_SUBJ_FILE("testSubjectFile", File.class),
+
+	/**
+	 * The number of collections to test.
+	 */
+	NO_OF_COLLECTIONS("noOfCollections", Integer.class),
+
+	/**
+	 * The id of the echo process.
+	 */
+	ECHO_PROCESS_ID("echoProcessId", String.class),
+
+	/**
+	 * Boolean indicating whether all processes should be tested against the OGC Process
+	 * Description Conformance Class.
+	 */
+	TEST_ALL_PROCESSES("testAllProcesses", Boolean.class),
+
+	/**
+	 * Number of processes that should be tested against the OGC Process Description
+	 * Conformance Class.
+	 */
+	PROCESS_TEST_LIMIT("processTestLimit", Integer.class),
+
+	/**
+	 * Parsed OpenApi3 document resource /api; Added during execution.
+	 */
+	API_MODEL("apiModel", OpenApi3.class),
+
+	/**
+	 * Use local OpenAPI schema included in ETS.
+	 */
+	USE_LOCAL_SCHEMA("useLocalSchema", Boolean.class),
+
+	/**
+	 * Requirement classes parsed from /conformance; Added during execution.
+	 */
+	REQUIREMENTCLASSES("requirementclasses", List.class);
+
+	private final Class attrType;
+
+	private final String attrName;
+
+	SuiteAttribute(String attrName, Class attrType) {
+		this.attrName = attrName;
+		this.attrType = attrType;
+	}
+
+	public Class getType() {
+		return attrType;
+	}
+
+	public String getName() {
+		return attrName;
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder sb = new StringBuilder(attrName);
+		sb.append('(').append(attrType.getName()).append(')');
+		return sb.toString();
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteFixtureListener.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteFixtureListener.java
index 93407fc..2a290f9 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteFixtureListener.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuiteFixtureListener.java
@@ -15,126 +15,131 @@
 import com.sun.jersey.api.client.Client;
 
 /**
- * A listener that performs various tasks before and after a test suite is run, usually concerned with maintaining a
- * shared test suite fixture. Since this listener is loaded using the ServiceLoader mechanism, its methods will be
- * called before those of other suite listeners listed in the test suite definition and before any annotated
+ * A listener that performs various tasks before and after a test suite is run, usually
+ * concerned with maintaining a shared test suite fixture. Since this listener is loaded
+ * using the ServiceLoader mechanism, its methods will be called before those of other
+ * suite listeners listed in the test suite definition and before any annotated
  * configuration methods.
  *
- * Attributes set on an ISuite instance are not inherited by constituent test group contexts (ITestContext). However,
- * suite attributes are still accessible from lower contexts.
+ * Attributes set on an ISuite instance are not inherited by constituent test group
+ * contexts (ITestContext). However, suite attributes are still accessible from lower
+ * contexts.
  *
  * @see org.testng.ISuite ISuite interface
  */
 public class SuiteFixtureListener implements ISuiteListener {
 
-    @Override
-    public void onStart( ISuite suite ) {
-        processSuiteParameters( suite );
-        registerClientComponent( suite );
-    }
+	@Override
+	public void onStart(ISuite suite) {
+		processSuiteParameters(suite);
+		registerClientComponent(suite);
+	}
 
-    @Override
-    public void onFinish( ISuite suite ) {
-        if ( null != System.getProperty( "deleteSubjectOnFinish" ) ) {
-            deleteTempFiles( suite );
-            System.getProperties().remove( "deleteSubjectOnFinish" );
-        }
-    }
+	@Override
+	public void onFinish(ISuite suite) {
+		if (null != System.getProperty("deleteSubjectOnFinish")) {
+			deleteTempFiles(suite);
+			System.getProperties().remove("deleteSubjectOnFinish");
+		}
+	}
 
-    /**
-     * Processes test suite arguments and sets suite attributes accordingly. The entity referenced by the
-     * {@link TestRunArg#IUT iut} argument is retrieved and written to a File that is set as the value of the suite
-     * attribute {@link SuiteAttribute#TEST_SUBJ_FILE testSubjectFile}.
-     *
-     * @param suite
-     *            An ISuite object representing a TestNG test suite.
-     */
-    void processSuiteParameters( ISuite suite ) {
-        Map<String, String> params = suite.getXmlSuite().getParameters();
-        TestSuiteLogger.log( Level.CONFIG, "Suite parameters\n" + params.toString() );
-        String iutParam = params.get( TestRunArg.IUT.toString() );
-        if ( ( null == iutParam ) || iutParam.isEmpty() ) {
-            throw new IllegalArgumentException( "Required test run parameter not found: " + TestRunArg.IUT.toString() );
-        }
-        URI iutRef = URI.create( iutParam.trim() );
-        suite.setAttribute( SuiteAttribute.IUT.getName(), iutRef );
-        File entityFile = null;
-        try {
-            entityFile = URIUtils.dereferenceURI( iutRef );
-        } catch ( IOException iox ) {
-            throw new RuntimeException( "Failed to dereference resource located at " + iutRef, iox );
-        }
-        TestSuiteLogger.log( Level.FINE, String.format( "Wrote test subject to file: %s (%d bytes)",
-                                                        entityFile.getAbsolutePath(), entityFile.length() ) );
-        suite.setAttribute( SuiteAttribute.TEST_SUBJ_FILE.getName(), entityFile );
-        
-        String echoProcessId = params.get( TestRunArg.ECHOPROCESSID.toString() );
-        try {
-        	if ( echoProcessId != null ) {
-        		suite.setAttribute( SuiteAttribute.ECHO_PROCESS_ID.getName(), echoProcessId );
-        	}
-        } catch ( NumberFormatException e ) {
-        	TestSuiteLogger.log( Level.WARNING,
-        			String.format( "Could not parse parameter %s: %s. Expected is a valid string",
-        					TestRunArg.ECHOPROCESSID.toString(), echoProcessId ) );
-        }
-        
-        String limit = params.get( TestRunArg.PROCESSTESTLIMIT.toString() );
-        try {
-        	if ( limit != null ) {
-        		suite.setAttribute( SuiteAttribute.PROCESS_TEST_LIMIT.getName(), Integer.valueOf(limit) );
-        	}
-        } catch ( NumberFormatException e ) {
-        	TestSuiteLogger.log( Level.WARNING,
-        			String.format( "Could not parse parameter %s: %s. Expected is a valid string",
-        					TestRunArg.PROCESSTESTLIMIT.toString(), limit ) );
-        }
-        
-        suite.setAttribute( SuiteAttribute.USE_LOCAL_SCHEMA.getName(), true );
-        
-        String testAllProcesses = params.get( TestRunArg.TESTALLPROCESSES.toString() );
+	/**
+	 * Processes test suite arguments and sets suite attributes accordingly. The entity
+	 * referenced by the {@link TestRunArg#IUT iut} argument is retrieved and written to a
+	 * File that is set as the value of the suite attribute
+	 * {@link SuiteAttribute#TEST_SUBJ_FILE testSubjectFile}.
+	 * @param suite An ISuite object representing a TestNG test suite.
+	 */
+	void processSuiteParameters(ISuite suite) {
+		Map<String, String> params = suite.getXmlSuite().getParameters();
+		TestSuiteLogger.log(Level.CONFIG, "Suite parameters\n" + params.toString());
+		String iutParam = params.get(TestRunArg.IUT.toString());
+		if ((null == iutParam) || iutParam.isEmpty()) {
+			throw new IllegalArgumentException("Required test run parameter not found: " + TestRunArg.IUT.toString());
+		}
+		URI iutRef = URI.create(iutParam.trim());
+		suite.setAttribute(SuiteAttribute.IUT.getName(), iutRef);
+		File entityFile = null;
+		try {
+			entityFile = URIUtils.dereferenceURI(iutRef);
+		}
+		catch (IOException iox) {
+			throw new RuntimeException("Failed to dereference resource located at " + iutRef, iox);
+		}
+		TestSuiteLogger.log(Level.FINE, String.format("Wrote test subject to file: %s (%d bytes)",
+				entityFile.getAbsolutePath(), entityFile.length()));
+		suite.setAttribute(SuiteAttribute.TEST_SUBJ_FILE.getName(), entityFile);
 
-        try {
-        	if ( testAllProcesses != null ) {
-        		suite.setAttribute( SuiteAttribute.TEST_ALL_PROCESSES.getName(), Boolean.valueOf(testAllProcesses.equals("on")?true:false) );
-        	}else {
-        		suite.setAttribute( SuiteAttribute.TEST_ALL_PROCESSES.getName(), false );
-        	}
-        } catch ( NumberFormatException e ) {
-        	TestSuiteLogger.log( Level.WARNING,
-        			String.format( "Could not parse parameter %s: %s. Expected is a valid string",
-        					TestRunArg.ECHOPROCESSID.toString(), echoProcessId ) );
-        }
-    }
+		String echoProcessId = params.get(TestRunArg.ECHOPROCESSID.toString());
+		try {
+			if (echoProcessId != null) {
+				suite.setAttribute(SuiteAttribute.ECHO_PROCESS_ID.getName(), echoProcessId);
+			}
+		}
+		catch (NumberFormatException e) {
+			TestSuiteLogger.log(Level.WARNING,
+					String.format("Could not parse parameter %s: %s. Expected is a valid string",
+							TestRunArg.ECHOPROCESSID.toString(), echoProcessId));
+		}
 
-    /**
-     * A client component is added to the suite fixture as the value of the {@link SuiteAttribute#CLIENT} attribute; it
-     * may be subsequently accessed via the {@link org.testng.ITestContext#getSuite()} method.
-     *
-     * @param suite
-     *            The test suite instance.
-     */
-    void registerClientComponent( ISuite suite ) {
-        Client client = ClientUtils.buildClient();
-        if ( null != client ) {
-            suite.setAttribute( SuiteAttribute.CLIENT.getName(), client );
-        }
-    }
+		String limit = params.get(TestRunArg.PROCESSTESTLIMIT.toString());
+		try {
+			if (limit != null) {
+				suite.setAttribute(SuiteAttribute.PROCESS_TEST_LIMIT.getName(), Integer.valueOf(limit));
+			}
+		}
+		catch (NumberFormatException e) {
+			TestSuiteLogger.log(Level.WARNING,
+					String.format("Could not parse parameter %s: %s. Expected is a valid string",
+							TestRunArg.PROCESSTESTLIMIT.toString(), limit));
+		}
+
+		suite.setAttribute(SuiteAttribute.USE_LOCAL_SCHEMA.getName(), true);
+
+		String testAllProcesses = params.get(TestRunArg.TESTALLPROCESSES.toString());
+
+		try {
+			if (testAllProcesses != null) {
+				suite.setAttribute(SuiteAttribute.TEST_ALL_PROCESSES.getName(),
+						Boolean.valueOf(testAllProcesses.equals("on") ? true : false));
+			}
+			else {
+				suite.setAttribute(SuiteAttribute.TEST_ALL_PROCESSES.getName(), false);
+			}
+		}
+		catch (NumberFormatException e) {
+			TestSuiteLogger.log(Level.WARNING,
+					String.format("Could not parse parameter %s: %s. Expected is a valid string",
+							TestRunArg.ECHOPROCESSID.toString(), echoProcessId));
+		}
+	}
+
+	/**
+	 * A client component is added to the suite fixture as the value of the
+	 * {@link SuiteAttribute#CLIENT} attribute; it may be subsequently accessed via the
+	 * {@link org.testng.ITestContext#getSuite()} method.
+	 * @param suite The test suite instance.
+	 */
+	void registerClientComponent(ISuite suite) {
+		Client client = ClientUtils.buildClient();
+		if (null != client) {
+			suite.setAttribute(SuiteAttribute.CLIENT.getName(), client);
+		}
+	}
+
+	/**
+	 * Deletes temporary files created during the test run if TestSuiteLogger is enabled
+	 * at the INFO level or higher (they are left intact at the CONFIG level or lower).
+	 * @param suite The test suite.
+	 */
+	void deleteTempFiles(ISuite suite) {
+		if (TestSuiteLogger.isLoggable(Level.CONFIG)) {
+			return;
+		}
+		File testSubjFile = (File) suite.getAttribute(SuiteAttribute.TEST_SUBJ_FILE.getName());
+		if (testSubjFile.exists()) {
+			testSubjFile.delete();
+		}
+	}
 
-    /**
-     * Deletes temporary files created during the test run if TestSuiteLogger is enabled at the INFO level or higher
-     * (they are left intact at the CONFIG level or lower).
-     *
-     * @param suite
-     *            The test suite.
-     */
-    void deleteTempFiles( ISuite suite ) {
-        if ( TestSuiteLogger.isLoggable( Level.CONFIG ) ) {
-            return;
-        }
-        File testSubjFile = (File) suite.getAttribute( SuiteAttribute.TEST_SUBJ_FILE.getName() );
-        if ( testSubjFile.exists() ) {
-            testSubjFile.delete();
-        }
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuitePreconditions.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuitePreconditions.java
index bfdb165..ab0852d 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/SuitePreconditions.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/SuitePreconditions.java
@@ -7,33 +7,32 @@
 import org.testng.annotations.BeforeSuite;
 
 /**
- * Checks that various preconditions are satisfied before the test suite is run.
- * If any of these (BeforeSuite) methods fail, all tests will be skipped.
+ * Checks that various preconditions are satisfied before the test suite is run. If any of
+ * these (BeforeSuite) methods fail, all tests will be skipped.
  */
 public class SuitePreconditions {
 
-    private static final Logger LOGR = Logger.getLogger(SuitePreconditions.class.getName());
+	private static final Logger LOGR = Logger.getLogger(SuitePreconditions.class.getName());
+
+	/**
+	 * Verifies that the referenced test subject exists and has the expected type.
+	 * @param testContext Information about the (pending) test run.
+	 */
+	@BeforeSuite
+	@SuppressWarnings("rawtypes")
+	public void verifyTestSubject(ITestContext testContext) {
+		SuiteAttribute testFileAttr = SuiteAttribute.TEST_SUBJ_FILE;
+		Object sutObj = testContext.getSuite().getAttribute(testFileAttr.getName());
+		Class expectedType = testFileAttr.getType();
+		if (null != sutObj && expectedType.isInstance(sutObj)) {
+			// TODO: Verify test subject
+		}
+		else {
+			String msg = String.format("Value of test suite attribute '%s' is missing or is not an instance of %s",
+					testFileAttr.getName(), expectedType.getName());
+			LOGR.log(Level.SEVERE, msg);
+			throw new AssertionError(msg);
+		}
+	}
 
-    /**
-     * Verifies that the referenced test subject exists and has the expected
-     * type.
-     *
-     * @param testContext
-     *            Information about the (pending) test run.
-     */
-    @BeforeSuite
-    @SuppressWarnings("rawtypes")
-    public void verifyTestSubject(ITestContext testContext) {
-        SuiteAttribute testFileAttr = SuiteAttribute.TEST_SUBJ_FILE;
-        Object sutObj = testContext.getSuite().getAttribute(testFileAttr.getName());
-        Class expectedType = testFileAttr.getType();
-        if (null != sutObj && expectedType.isInstance(sutObj)) {
-            // TODO: Verify test subject
-        } else {
-            String msg = String.format("Value of test suite attribute '%s' is missing or is not an instance of %s",
-                    testFileAttr.getName(), expectedType.getName());
-            LOGR.log(Level.SEVERE, msg);
-            throw new AssertionError(msg);
-        }
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestFailureListener.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestFailureListener.java
index 585b1c4..8e2eb32 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestFailureListener.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestFailureListener.java
@@ -12,87 +12,84 @@
 import org.w3c.dom.Document;
 
 /**
- * A listener that augments a test result with diagnostic information in the
- * event that a test method failed. This information will appear in the XML
- * report when the test run is completed.
+ * A listener that augments a test result with diagnostic information in the event that a
+ * test method failed. This information will appear in the XML report when the test run is
+ * completed.
  */
 public class TestFailureListener extends TestListenerAdapter {
 
-    /**
-     * Sets the "request" and "response" attributes of a test result. The value
-     * of these attributes is a string that contains information about the
-     * content of an outgoing or incoming message: target resource, status code,
-     * headers, entity (if present). The entity is represented as a String with
-     * UTF-8 character encoding.
-     *
-     * @param result A description of a test result (with a fail verdict).
-     */
-    @Override
-    public void onTestFailure(ITestResult result) {
-        super.onTestFailure(result);
-        Object instance = result.getInstance();
-        if (CommonFixture.class.isInstance(instance)) {
-            CommonFixture fixture = CommonFixture.class.cast(instance);
-            result.setAttribute("request", fixture.getRequest());
-            result.setAttribute("response", fixture.getResponse());
-        }
-    }
+	/**
+	 * Sets the "request" and "response" attributes of a test result. The value of these
+	 * attributes is a string that contains information about the content of an outgoing
+	 * or incoming message: target resource, status code, headers, entity (if present).
+	 * The entity is represented as a String with UTF-8 character encoding.
+	 * @param result A description of a test result (with a fail verdict).
+	 */
+	@Override
+	public void onTestFailure(ITestResult result) {
+		super.onTestFailure(result);
+		Object instance = result.getInstance();
+		if (CommonFixture.class.isInstance(instance)) {
+			CommonFixture fixture = CommonFixture.class.cast(instance);
+			result.setAttribute("request", fixture.getRequest());
+			result.setAttribute("response", fixture.getResponse());
+		}
+	}
 
-    /**
-     * Gets diagnostic information about a request message. If the request
-     * contains a message body, it should be represented as a DOM Document node
-     * or as an object having a meaningful toString() implementation.
-     *
-     * @param req An object representing an HTTP request message.
-     * @return A string containing information gleaned from the request message.
-     */
-    String getRequestMessageInfo(ClientRequest req) {
-        if (null == req) {
-            return "No request message.";
-        }
-        StringBuilder msgInfo = new StringBuilder();
-        msgInfo.append("Method: ").append(req.getMethod()).append('\n');
-        msgInfo.append("Target URI: ").append(req.getURI()).append('\n');
-        msgInfo.append("Headers: ").append(req.getHeaders()).append('\n');
-        if (null != req.getEntity()) {
-            Object entity = req.getEntity();
-            String body;
-            if (Document.class.isInstance(entity)) {
-                Document doc = Document.class.cast(entity);
-                body = XMLUtils.writeNodeToString(doc);
-            } else {
-                body = entity.toString();
-            }
-            msgInfo.append(body).append('\n');
-        }
-        return msgInfo.toString();
-    }
+	/**
+	 * Gets diagnostic information about a request message. If the request contains a
+	 * message body, it should be represented as a DOM Document node or as an object
+	 * having a meaningful toString() implementation.
+	 * @param req An object representing an HTTP request message.
+	 * @return A string containing information gleaned from the request message.
+	 */
+	String getRequestMessageInfo(ClientRequest req) {
+		if (null == req) {
+			return "No request message.";
+		}
+		StringBuilder msgInfo = new StringBuilder();
+		msgInfo.append("Method: ").append(req.getMethod()).append('\n');
+		msgInfo.append("Target URI: ").append(req.getURI()).append('\n');
+		msgInfo.append("Headers: ").append(req.getHeaders()).append('\n');
+		if (null != req.getEntity()) {
+			Object entity = req.getEntity();
+			String body;
+			if (Document.class.isInstance(entity)) {
+				Document doc = Document.class.cast(entity);
+				body = XMLUtils.writeNodeToString(doc);
+			}
+			else {
+				body = entity.toString();
+			}
+			msgInfo.append(body).append('\n');
+		}
+		return msgInfo.toString();
+	}
 
-    /**
-     * Gets diagnostic information about a response message.
-     *
-     * @param rsp An object representing an HTTP response message.
-     * @return A string containing information gleaned from the response
-     * message.
-     */
-    String getResponseMessageInfo(ClientResponse rsp) {
-        if (null == rsp) {
-            return "No response message.";
-        }
-        StringBuilder msgInfo = new StringBuilder();
-        msgInfo.append("Status: ").append(rsp.getStatus()).append('\n');
-        msgInfo.append("Headers: ").append(rsp.getHeaders()).append('\n');
-        if (rsp.hasEntity()) {
-            if (rsp.getType().isCompatible(MediaType.APPLICATION_XML_TYPE)) {
-                Document doc = ClientUtils.getResponseEntityAsDocument(rsp, null);
-                msgInfo.append(XMLUtils.writeNodeToString(doc));
-            } else {
-                byte[] body = rsp.getEntity(byte[].class);
-                msgInfo.append(new String(body, StandardCharsets.UTF_8));
-            }
-            msgInfo.append('\n');
-        }
-        return msgInfo.toString();
-    }
+	/**
+	 * Gets diagnostic information about a response message.
+	 * @param rsp An object representing an HTTP response message.
+	 * @return A string containing information gleaned from the response message.
+	 */
+	String getResponseMessageInfo(ClientResponse rsp) {
+		if (null == rsp) {
+			return "No response message.";
+		}
+		StringBuilder msgInfo = new StringBuilder();
+		msgInfo.append("Status: ").append(rsp.getStatus()).append('\n');
+		msgInfo.append("Headers: ").append(rsp.getHeaders()).append('\n');
+		if (rsp.hasEntity()) {
+			if (rsp.getType().isCompatible(MediaType.APPLICATION_XML_TYPE)) {
+				Document doc = ClientUtils.getResponseEntityAsDocument(rsp, null);
+				msgInfo.append(XMLUtils.writeNodeToString(doc));
+			}
+			else {
+				byte[] body = rsp.getEntity(byte[].class);
+				msgInfo.append(new String(body, StandardCharsets.UTF_8));
+			}
+			msgInfo.append('\n');
+		}
+		return msgInfo.toString();
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestNGController.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestNGController.java
index 0f2aaaa..0ba38a2 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestNGController.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestNGController.java
@@ -30,140 +30,138 @@
  */
 public class TestNGController implements TestSuiteController {
 
-    private TestRunExecutor executor;
-    private Properties etsProperties = new Properties();
-
-    /**
-     * A convenience method for running the test suite using a command-line
-     * interface. The default values of the test run arguments are as follows:
-     * <ul>
-     * <li>XML properties file: ${user.home}/test-run-props.xml</li>
-     * <li>outputDir: ${user.home}</li>
-     * <li>deleteSubjectOnFinish: false</li>
-     * </ul>
-     * <p>
-     * <strong>Synopsis</strong>
-     * </p>
-     *
-     * <pre>
-     * ets-*-aio.jar [-o|--outputDir $TMPDIR] [-d|--deleteSubjectOnFinish] [test-run-props.xml]
-     * </pre>
-     *
-     * @param args
-     *            Test run arguments (optional). The first argument must refer
-	   *            to an XML properties file containing the expected set of test
-	   *            run arguments. If no argument is supplied, the file located at
-	   *            ${user.home}/test-run-props.xml will be used.
-     * @throws Exception
-     *             If the test run cannot be executed (usually due to
-     *             unsatisfied pre-conditions).
-     */
-    public static void main(String[] args) throws Exception {
-        CommandLineArguments testRunArgs = new CommandLineArguments();
-        JCommander cmd = new JCommander(testRunArgs);
-        try {
-            cmd.parse(args);
-        } catch (ParameterException px) {
-            System.out.println(px.getMessage());
-            cmd.usage();
-        }
-        if (testRunArgs.doDeleteSubjectOnFinish()) {
-            System.setProperty("deleteSubjectOnFinish", "true");
-        }
-        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-        DocumentBuilder db = dbf.newDocumentBuilder();
-        File xmlArgs = testRunArgs.getPropertiesFile();
-        Document testRunProps = db.parse(xmlArgs);
-        TestNGController controller = new TestNGController(testRunArgs.getOutputDir());
-        Source testResults = controller.doTestRun(testRunProps);
-        System.out.println("Test results: " + testResults.getSystemId());
-    }
-
-    /**
-     * Default constructor uses the location given by the "java.io.tmpdir"
-     * system property as the root output directory.
-     */
-    public TestNGController() {
-        this(System.getProperty("java.io.tmpdir"));
-    }
-
-    /**
-     * Construct a controller that writes results to the given output directory.
-     *
-     * @param outputDir
-     *            The location of the directory in which test results will be
-     *            written (a file system path or a 'file' URI). It will be
-     *            created if it does not exist.
-     */
-    public TestNGController(String outputDir) {
-        InputStream is = getClass().getResourceAsStream("ets.properties");
-        try {
-            this.etsProperties.load(is);
-        } catch (IOException ex) {
-            TestSuiteLogger.log(Level.WARNING, "Unable to load ets.properties. " + ex.getMessage());
-        }
-        URL tngSuite = TestNGController.class.getResource("testng.xml");
-        File resultsDir;
-        if (null == outputDir || outputDir.isEmpty()) {
-            resultsDir = new File(System.getProperty("user.home"));
-        } else if (outputDir.startsWith("file:")) {
-            resultsDir = new File(URI.create(outputDir));
-        } else {
-            resultsDir = new File(outputDir);
-        }
-        TestSuiteLogger.log(Level.CONFIG, "Using TestNG config: " + tngSuite);
-        TestSuiteLogger.log(Level.CONFIG, "Using outputDirPath: " + resultsDir.getAbsolutePath());
-        // NOTE: setting third argument to 'true' enables the default listeners
-        this.executor = new TestNGExecutor(tngSuite.toString(), resultsDir.getAbsolutePath(), false);
-    }
-
-    @Override
-    public String getCode() {
-        return etsProperties.getProperty("ets-code");
-    }
-
-    @Override
-    public String getVersion() {
-        return etsProperties.getProperty("ets-version");
-    }
-
-    @Override
-    public String getTitle() {
-        return etsProperties.getProperty("ets-title");
-    }
-
-    @Override
-    public Source doTestRun(Document testRunArgs) throws Exception {
-        validateTestRunArgs(testRunArgs);
-        return executor.execute(testRunArgs);
-    }
-
-    /**
-     * Validates the test run arguments. The test run is aborted if any of these
-     * checks fail.
-     *
-     * @param testRunArgs
-     *            A DOM Document containing a set of XML properties (key-value
-     *            pairs).
-     * @throws IllegalArgumentException
-     *             If any arguments are missing or invalid for some reason.
-     */
-    void validateTestRunArgs(Document testRunArgs) {
-        if (null == testRunArgs || !testRunArgs.getDocumentElement().getNodeName().equals("properties")) {
-            throw new IllegalArgumentException("Input is not an XML properties document.");
-        }
-        NodeList entries = testRunArgs.getDocumentElement().getElementsByTagName("entry");
-        if (entries.getLength() == 0) {
-            throw new IllegalArgumentException("No test run arguments found.");
-        }
-        Map<String, String> args = new HashMap<String, String>();
-        for (int i = 0; i < entries.getLength(); i++) {
-            Element entry = (Element) entries.item(i);
-            args.put(entry.getAttribute("key"), entry.getTextContent());
-        }
-        if (!args.containsKey(TestRunArg.IUT.toString())) {
-            throw new IllegalArgumentException(
-                    String.format("Missing argument: '%s' must be present.", TestRunArg.IUT));
-        }
-    }
+	private TestRunExecutor executor;
+
+	private Properties etsProperties = new Properties();
+
+	/**
+	 * A convenience method for running the test suite using a command-line interface. The
+	 * default values of the test run arguments are as follows:
+	 * <ul>
+	 * <li>XML properties file: ${user.home}/test-run-props.xml</li>
+	 * <li>outputDir: ${user.home}</li>
+	 * <li>deleteSubjectOnFinish: false</li>
+	 * </ul>
+	 * <p>
+	 * <strong>Synopsis</strong>
+	 * </p>
+	 *
+	 * <pre>
+	 * ets-*-aio.jar [-o|--outputDir $TMPDIR] [-d|--deleteSubjectOnFinish] [test-run-props.xml]
+	 * </pre>
+	 * @param args Test run arguments (optional). The first argument must refer to an XML
+	 * properties file containing the expected set of test run arguments. If no argument
+	 * is supplied, the file located at ${user.home}/test-run-props.xml will be used.
+	 * @throws Exception If the test run cannot be executed (usually due to unsatisfied
+	 * pre-conditions).
+	 */
+	public static void main(String[] args) throws Exception {
+		CommandLineArguments testRunArgs = new CommandLineArguments();
+		JCommander cmd = new JCommander(testRunArgs);
+		try {
+			cmd.parse(args);
+		}
+		catch (ParameterException px) {
+			System.out.println(px.getMessage());
+			cmd.usage();
+		}
+		if (testRunArgs.doDeleteSubjectOnFinish()) {
+			System.setProperty("deleteSubjectOnFinish", "true");
+		}
+		DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+		DocumentBuilder db = dbf.newDocumentBuilder();
+		File xmlArgs = testRunArgs.getPropertiesFile();
+		Document testRunProps = db.parse(xmlArgs);
+		TestNGController controller = new TestNGController(testRunArgs.getOutputDir());
+		Source testResults = controller.doTestRun(testRunProps);
+		System.out.println("Test results: " + testResults.getSystemId());
+	}
+
+	/**
+	 * Default constructor uses the location given by the "java.io.tmpdir" system property
+	 * as the root output directory.
+	 */
+	public TestNGController() {
+		this(System.getProperty("java.io.tmpdir"));
+	}
+
+	/**
+	 * Construct a controller that writes results to the given output directory.
+	 * @param outputDir The location of the directory in which test results will be
+	 * written (a file system path or a 'file' URI). It will be created if it does not
+	 * exist.
+	 */
+	public TestNGController(String outputDir) {
+		InputStream is = getClass().getResourceAsStream("ets.properties");
+		try {
+			this.etsProperties.load(is);
+		}
+		catch (IOException ex) {
+			TestSuiteLogger.log(Level.WARNING, "Unable to load ets.properties. " + ex.getMessage());
+		}
+		URL tngSuite = TestNGController.class.getResource("testng.xml");
+		File resultsDir;
+		if (null == outputDir || outputDir.isEmpty()) {
+			resultsDir = new File(System.getProperty("user.home"));
+		}
+		else if (outputDir.startsWith("file:")) {
+			resultsDir = new File(URI.create(outputDir));
+		}
+		else {
+			resultsDir = new File(outputDir);
+		}
+		TestSuiteLogger.log(Level.CONFIG, "Using TestNG config: " + tngSuite);
+		TestSuiteLogger.log(Level.CONFIG, "Using outputDirPath: " + resultsDir.getAbsolutePath());
+		// NOTE: setting third argument to 'true' enables the default listeners
+		this.executor = new TestNGExecutor(tngSuite.toString(), resultsDir.getAbsolutePath(), false);
+	}
+
+	@Override
+	public String getCode() {
+		return etsProperties.getProperty("ets-code");
+	}
+
+	@Override
+	public String getVersion() {
+		return etsProperties.getProperty("ets-version");
+	}
+
+	@Override
+	public String getTitle() {
+		return etsProperties.getProperty("ets-title");
+	}
+
+	@Override
+	public Source doTestRun(Document testRunArgs) throws Exception {
+		validateTestRunArgs(testRunArgs);
+		return executor.execute(testRunArgs);
+	}
+
+	/**
+	 * Validates the test run arguments. The test run is aborted if any of these checks
+	 * fail.
+	 * @param testRunArgs A DOM Document containing a set of XML properties (key-value
+	 * pairs).
+	 * @throws IllegalArgumentException If any arguments are missing or invalid for some
+	 * reason.
+	 */
+	void validateTestRunArgs(Document testRunArgs) {
+		if (null == testRunArgs || !testRunArgs.getDocumentElement().getNodeName().equals("properties")) {
+			throw new IllegalArgumentException("Input is not an XML properties document.");
+		}
+		NodeList entries = testRunArgs.getDocumentElement().getElementsByTagName("entry");
+		if (entries.getLength() == 0) {
+			throw new IllegalArgumentException("No test run arguments found.");
+		}
+		Map<String, String> args = new HashMap<String, String>();
+		for (int i = 0; i < entries.getLength(); i++) {
+			Element entry = (Element) entries.item(i);
+			args.put(entry.getAttribute("key"), entry.getTextContent());
+		}
+		if (!args.containsKey(TestRunArg.IUT.toString())) {
+			throw new IllegalArgumentException(
+					String.format("Missing argument: '%s' must be present.", TestRunArg.IUT));
+		}
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunArg.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunArg.java
index 3c86740..6a24abe 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunArg.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunArg.java
@@ -5,38 +5,43 @@
  */
 public enum TestRunArg {
 
-    /**
-     * An absolute URI that refers to a representation of the test subject or metadata about it.
-     */
-    IUT,
-
-    /**
-     * The number of collections to test (a value less or equal to 0 means all collections).
-     */
-    NOOFCOLLECTIONS,
-	
+	/**
+	 * An absolute URI that refers to a representation of the test subject or metadata
+	 * about it.
+	 */
+	IUT,
+
+	/**
+	 * The number of collections to test (a value less or equal to 0 means all
+	 * collections).
+	 */
+	NOOFCOLLECTIONS,
+
 	/**
 	 * The id of the echo process.
 	 */
-	ECHOPROCESSID, 	
-	
+	ECHOPROCESSID,
+
 	/**
-	 * Limit of processes to be tested against the OGC Process Description Conformance Class.
+	 * Limit of processes to be tested against the OGC Process Description Conformance
+	 * Class.
 	 */
 	PROCESSTESTLIMIT,
-        
-        /**
-         * Use local OpenAPI schema.
-         */
-        USELOCALSCHEMA,
-    
-    /**
-     * Boolean indicating whether all processes should be tested against the OGC Process Description Conformance Class.
-     */
+
+	/**
+	 * Use local OpenAPI schema.
+	 */
+	USELOCALSCHEMA,
+
+	/**
+	 * Boolean indicating whether all processes should be tested against the OGC Process
+	 * Description Conformance Class.
+	 */
 	TESTALLPROCESSES;
 
-    @Override
-    public String toString() {
-        return name().toLowerCase();
-    }
+	@Override
+	public String toString() {
+		return name().toLowerCase();
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunListener.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunListener.java
index c7eb1cb..098c8dd 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunListener.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/TestRunListener.java
@@ -3,24 +3,27 @@
 import org.testng.IExecutionListener;
 
 /**
- * A listener that is invoked before and after a test run. It is often used to
- * configure a shared fixture that endures for the duration of the entire test
- * run. A FixtureManager may be used to manage such a fixture.
+ * A listener that is invoked before and after a test run. It is often used to configure a
+ * shared fixture that endures for the duration of the entire test run. A FixtureManager
+ * may be used to manage such a fixture.
  *
- * <p>A shared fixture should be used with caution in order to avoid undesirable
- * test interactions. In general, it should be populated with "read-only"
- * objects that are not modified during the test run.</p>
+ * <p>
+ * A shared fixture should be used with caution in order to avoid undesirable test
+ * interactions. In general, it should be populated with "read-only" objects that are not
+ * modified during the test run.
+ * </p>
  *
  * @see com.occamlab.te.spi.executors.FixtureManager FixtureManager
  *
  */
 public class TestRunListener implements IExecutionListener {
 
-    @Override
-    public void onExecutionStart() {
-    }
+	@Override
+	public void onExecutionStart() {
+	}
+
+	@Override
+	public void onExecutionFinish() {
+	}
 
-    @Override
-    public void onExecutionFinish() {
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/Conformance.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/Conformance.java
index 2123727..49fee75 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/Conformance.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/Conformance.java
@@ -16,7 +16,6 @@
 import java.util.List;
 import java.util.Map;
 
-
 import org.opengis.cite.ogcapiprocesses10.CommonFixture;
 import org.opengis.cite.ogcapiprocesses10.openapi3.TestPoint;
 import org.opengis.cite.ogcapiprocesses10.openapi3.UriBuilder;
@@ -35,102 +34,98 @@
  *
  * A.2.3. Conformance Path {root}/conformance
  *
- *
  * @author <a href="mailto:goltz@lat-lon.de">Lyn Goltz </a>
  */
 public class Conformance extends CommonFixture {
 
-    private List<RequirementClass> requirementClasses;
-
-    private static String urlSchema="http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/confClasses.yaml";
-    
-    @DataProvider(name = "conformance")
-    public Object[][] conformanceUris( ITestContext testContext ) {
-        OpenApi3 apiModel = (OpenApi3) testContext.getSuite().getAttribute( API_MODEL.getName() );
-        URI iut = (URI) testContext.getSuite().getAttribute( IUT.getName() );
-
-        TestPoint tp = null;
-        if(rootUri.toString().endsWith("/")) {
-          tp = new TestPoint(rootUri.toString(),"conformance",null);
-        }
-        else {
-        	tp = new TestPoint(rootUri.toString(),"/conformance",null);
-        }
-
-
-        List<TestPoint> testPoints = new ArrayList<TestPoint>();
-        testPoints.add(tp);
-        Object[][] testPointsData = new Object[1][];
-        int i = 0;
-        for ( TestPoint testPoint : testPoints ) {
-            testPointsData[i++] = new Object[] { testPoint };
-        }
-        return testPointsData;
-    }
-
-    @AfterClass
-    public void storeRequirementClassesInTestContext( ITestContext testContext ) {
-        testContext.getSuite().setAttribute( REQUIREMENTCLASSES.getName(), this.requirementClasses );
-    }
-
-    /**
-     * Partly addresses Requirement 1 : /req/processes/core/conformance-success
-     * 
-     * @param testPoint
-     *            the test point to test, never <code>null</code>
-     */
-    @Test(description = "Implements /conf/core/conformance-success (partial)", groups = "A.2.3. Conformance Path /conformance", dataProvider = "conformance")
-    public void testValidateConformanceOperationAndResponse( TestPoint testPoint ) {
-        String testPointUri = testPoint.getServerUrl() + testPoint.getPath();
-        Response response = init().baseUri( testPointUri ).accept( JSON ).when().request( GET );
-        this.rspEntity = response.getBody().asInputStream();
-        validateConformanceOperationResponse( testPointUri, response );
-    }
-
-    /**
-     * Requirement 1 : /req/processes/core/conformance-success
-     *
-     * Abstract Test A.2.3.6.1: /conf/core/conformance-success
-     * Abstract Test A.2.3.6.2: /conf/core/conformance-success 
-     * Abstract Test A.2.3.6.3: /conf/core/conformance-success
-     * Abstract Test A.2.3.6.4: /conf/core/conformance-success TODO / DOABLE?
-     */
-    private void validateConformanceOperationResponse( String testPointUri, Response response ) {
-        response.then().statusCode( 200 );
-
-	assertTrue( validateResponseAgainstSchema(Conformance.urlSchema,response.getBody().asString()),
-		    "Unable to validate the response document against: "+Conformance.urlSchema);
-	
-        JsonPath jsonPath = response.jsonPath();
-        this.requirementClasses = parseAndValidateRequirementClasses( jsonPath );
-        assertTrue( this.requirementClasses.contains( CORE ),
-                    "Conformance class \"http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core\" is not available from path "
-                                                              + testPointUri );
-    }
-
-    /**
-     * @param jsonPath
-     *            never <code>null</code>
-     * @return the parsed requirement classes, never <code>null</code>
-     * @throws AssertionError
-     *             if the json does not follow the expected structure
-     */
-    List<RequirementClass> parseAndValidateRequirementClasses( JsonPath jsonPath ) {
-        List<Object> conformsTo = jsonPath.getList( "conformsTo" );
-        assertNotNull( conformsTo, "Missing member 'conformsTo'." );
-
-        List<RequirementClass> requirementClasses = new ArrayList<>();
-        for ( Object conformTo : conformsTo ) {
-            if ( conformTo instanceof String ) {
-                String conformanceClass = (String) conformTo;
-                RequirementClass requirementClass = RequirementClass.byConformanceClass( conformanceClass );
-                if ( requirementClass != null )
-                    requirementClasses.add( requirementClass );
-            } else
-                throw new AssertionError( "At least one element array 'conformsTo' is not a string value (" + conformTo
-                                          + ")" );
-        }
-        return requirementClasses;
-    }
+	private List<RequirementClass> requirementClasses;
+
+	private static String urlSchema = "http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/confClasses.yaml";
+
+	@DataProvider(name = "conformance")
+	public Object[][] conformanceUris(ITestContext testContext) {
+		OpenApi3 apiModel = (OpenApi3) testContext.getSuite().getAttribute(API_MODEL.getName());
+		URI iut = (URI) testContext.getSuite().getAttribute(IUT.getName());
+
+		TestPoint tp = null;
+		if (rootUri.toString().endsWith("/")) {
+			tp = new TestPoint(rootUri.toString(), "conformance", null);
+		}
+		else {
+			tp = new TestPoint(rootUri.toString(), "/conformance", null);
+		}
+
+		List<TestPoint> testPoints = new ArrayList<TestPoint>();
+		testPoints.add(tp);
+		Object[][] testPointsData = new Object[1][];
+		int i = 0;
+		for (TestPoint testPoint : testPoints) {
+			testPointsData[i++] = new Object[] { testPoint };
+		}
+		return testPointsData;
+	}
+
+	@AfterClass
+	public void storeRequirementClassesInTestContext(ITestContext testContext) {
+		testContext.getSuite().setAttribute(REQUIREMENTCLASSES.getName(), this.requirementClasses);
+	}
+
+	/**
+	 * Partly addresses Requirement 1 : /req/processes/core/conformance-success
+	 * @param testPoint the test point to test, never <code>null</code>
+	 */
+	@Test(description = "Implements /conf/core/conformance-success (partial)",
+			groups = "A.2.3. Conformance Path /conformance", dataProvider = "conformance")
+	public void testValidateConformanceOperationAndResponse(TestPoint testPoint) {
+		String testPointUri = testPoint.getServerUrl() + testPoint.getPath();
+		Response response = init().baseUri(testPointUri).accept(JSON).when().request(GET);
+		this.rspEntity = response.getBody().asInputStream();
+		validateConformanceOperationResponse(testPointUri, response);
+	}
+
+	/**
+	 * Requirement 1 : /req/processes/core/conformance-success
+	 *
+	 * Abstract Test A.2.3.6.1: /conf/core/conformance-success Abstract Test A.2.3.6.2:
+	 * /conf/core/conformance-success Abstract Test A.2.3.6.3:
+	 * /conf/core/conformance-success Abstract Test A.2.3.6.4:
+	 * /conf/core/conformance-success TODO / DOABLE?
+	 */
+	private void validateConformanceOperationResponse(String testPointUri, Response response) {
+		response.then().statusCode(200);
+
+		assertTrue(validateResponseAgainstSchema(Conformance.urlSchema, response.getBody().asString()),
+				"Unable to validate the response document against: " + Conformance.urlSchema);
+
+		JsonPath jsonPath = response.jsonPath();
+		this.requirementClasses = parseAndValidateRequirementClasses(jsonPath);
+		assertTrue(this.requirementClasses.contains(CORE),
+				"Conformance class \"http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core\" is not available from path "
+						+ testPointUri);
+	}
+
+	/**
+	 * @param jsonPath never <code>null</code>
+	 * @return the parsed requirement classes, never <code>null</code>
+	 * @throws AssertionError if the json does not follow the expected structure
+	 */
+	List<RequirementClass> parseAndValidateRequirementClasses(JsonPath jsonPath) {
+		List<Object> conformsTo = jsonPath.getList("conformsTo");
+		assertNotNull(conformsTo, "Missing member 'conformsTo'.");
+
+		List<RequirementClass> requirementClasses = new ArrayList<>();
+		for (Object conformTo : conformsTo) {
+			if (conformTo instanceof String) {
+				String conformanceClass = (String) conformTo;
+				RequirementClass requirementClass = RequirementClass.byConformanceClass(conformanceClass);
+				if (requirementClass != null)
+					requirementClasses.add(requirementClass);
+			}
+			else
+				throw new AssertionError(
+						"At least one element array 'conformsTo' is not a string value (" + conformTo + ")");
+		}
+		return requirementClasses;
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/RequirementClass.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/RequirementClass.java
index a04d0e5..4995e21 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/RequirementClass.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/conformance/RequirementClass.java
@@ -1,7 +1,7 @@
 package org.opengis.cite.ogcapiprocesses10.conformance;
 
 /**
- * 
+ *
  *
  * Encapsulates all known requirement classes.
  *
@@ -9,67 +9,65 @@
  */
 public enum RequirementClass {
 
-    CORE( "http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core" );
-
-
+	CORE("http://www.opengis.net/spec/ogcapi-processes-1/1.0/conf/core");
 
-    private final String conformanceClass;
+	private final String conformanceClass;
 
-    private final String mediaTypeFeaturesAndCollections;
+	private final String mediaTypeFeaturesAndCollections;
 
-    private final String mediaTypeOtherResources;
+	private final String mediaTypeOtherResources;
 
-    RequirementClass( String conformanceClass ) {
-        this( conformanceClass, null, null );
-    }
+	RequirementClass(String conformanceClass) {
+		this(conformanceClass, null, null);
+	}
 
-    RequirementClass( String conformanceClass, String mediaTypeFeaturesAndCollections, String mediaTypeOtherResources ) {
-        this.conformanceClass = conformanceClass;
-        this.mediaTypeFeaturesAndCollections = mediaTypeFeaturesAndCollections;
-        this.mediaTypeOtherResources = mediaTypeOtherResources;
-    }
+	RequirementClass(String conformanceClass, String mediaTypeFeaturesAndCollections, String mediaTypeOtherResources) {
+		this.conformanceClass = conformanceClass;
+		this.mediaTypeFeaturesAndCollections = mediaTypeFeaturesAndCollections;
+		this.mediaTypeOtherResources = mediaTypeOtherResources;
+	}
 
-    /**
-     * @return <code>true</code> if the RequirementClass has a media type for features and collections,
-     *         <code>true</code> otherwise
-     */
-    public boolean hasMediaTypeForFeaturesAndCollections() {
-        return mediaTypeFeaturesAndCollections != null;
-    }
+	/**
+	 * @return <code>true</code> if the RequirementClass has a media type for features and
+	 * collections, <code>true</code> otherwise
+	 */
+	public boolean hasMediaTypeForFeaturesAndCollections() {
+		return mediaTypeFeaturesAndCollections != null;
+	}
 
-    /**
-     * @return media type for features and collections, <code>null</code> if not available
-     */
-    public String getMediaTypeFeaturesAndCollections() {
-        return mediaTypeFeaturesAndCollections;
-    }
+	/**
+	 * @return media type for features and collections, <code>null</code> if not available
+	 */
+	public String getMediaTypeFeaturesAndCollections() {
+		return mediaTypeFeaturesAndCollections;
+	}
 
-    /**
-     * @return <code>true</code> if the RequirementClass has a media type for other resources,
-     *         <code>true</code> otherwise
-     */
-    public boolean hasMediaTypeForOtherResources() {
-        return mediaTypeOtherResources != null;
-    }
+	/**
+	 * @return <code>true</code> if the RequirementClass has a media type for other
+	 * resources, <code>true</code> otherwise
+	 */
+	public boolean hasMediaTypeForOtherResources() {
+		return mediaTypeOtherResources != null;
+	}
 
-    /**
-     * @return media type of other resources, <code>null</code> if not available
-     */
-    public String getMediaTypeOtherResources() {
-        return mediaTypeOtherResources;
-    }
+	/**
+	 * @return media type of other resources, <code>null</code> if not available
+	 */
+	public String getMediaTypeOtherResources() {
+		return mediaTypeOtherResources;
+	}
 
-    /**
-     * @param conformanceClass
-     *            the conformance class of the RequirementClass to return.
-     * @return the RequirementClass with the passed conformance class, <code>null</code> if RequirementClass exists
-     */
-    public static RequirementClass byConformanceClass( String conformanceClass ) {
-        for ( RequirementClass requirementClass : values() ) {
-            if ( requirementClass.conformanceClass.equals( conformanceClass ) )
-                return requirementClass;
-        }
-        return null;
-    }
+	/**
+	 * @param conformanceClass the conformance class of the RequirementClass to return.
+	 * @return the RequirementClass with the passed conformance class, <code>null</code>
+	 * if RequirementClass exists
+	 */
+	public static RequirementClass byConformanceClass(String conformanceClass) {
+		for (RequirementClass requirementClass : values()) {
+			if (requirementClass.conformanceClass.equals(conformanceClass))
+				return requirementClass;
+		}
+		return null;
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/general/GeneralHttp.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/general/GeneralHttp.java
index 8a4a742..242a9ea 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/general/GeneralHttp.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/general/GeneralHttp.java
@@ -15,26 +15,26 @@
  */
 public class GeneralHttp extends CommonFixture {
 
-    /**
-     * <pre>
-     * A.2.1.1. HTTP
-     *
-     * Abstract Test 1: /ats/core/http
-     * Test Purpose: Validate that the resource paths advertised through the API conform with HTTP 1.1 and, where
-     * appropriate, TLS.
-     * Requirement: /req/core/http
-     *
-     * Test Method:
-     *  1. All compliance tests shall be configured to use the HTTP 1.1 protocol exclusively.
-     *  2. For APIs which support HTTPS, all compliance tests shall be configured to use HTTP over TLS (RFC 2818) with
-     * their HTTP 1.1 protocol. (untested)
-     * </pre>
-     */
-    @Test(description = "Implements A.2.1.1. HTTP, Abstract Test 1 (Requirement /req/core/http)")
-    public void testHttp() {
-        Response response = init().baseUri( rootUri.toString() ).when().request( GET, "/" );
-        this.rspEntity = response.getBody().asInputStream();
-        response.then().statusLine( containsString( "HTTP/1.1" ) );
-    }
+	/**
+	 * <pre>
+	 * A.2.1.1. HTTP
+	 *
+	 * Abstract Test 1: /ats/core/http
+	 * Test Purpose: Validate that the resource paths advertised through the API conform with HTTP 1.1 and, where
+	 * appropriate, TLS.
+	 * Requirement: /req/core/http
+	 *
+	 * Test Method:
+	 *  1. All compliance tests shall be configured to use the HTTP 1.1 protocol exclusively.
+	 *  2. For APIs which support HTTPS, all compliance tests shall be configured to use HTTP over TLS (RFC 2818) with
+	 * their HTTP 1.1 protocol. (untested)
+	 * </pre>
+	 */
+	@Test(description = "Implements A.2.1.1. HTTP, Abstract Test 1 (Requirement /req/core/http)")
+	public void testHttp() {
+		Response response = init().baseUri(rootUri.toString()).when().request(GET, "/");
+		this.rspEntity = response.getBody().asInputStream();
+		response.then().statusLine(containsString("HTTP/1.1"));
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/joblist/JobList.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/joblist/JobList.java
index 64178c0..3602e42 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/joblist/JobList.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/joblist/JobList.java
@@ -65,39 +65,41 @@
 
 /**
  *
- * A.2.6. JobList  {root}/jobs
+ * A.2.6. JobList {root}/jobs
  *
  * @author <a href="mailto:b.pross@52north.org">Benjamin Pross</a>
  */
 public class JobList extends CommonFixture {
+
 	private static final String OPERATION_ID = "getJobs";
 
 	private OpenApi3 openApi3;
-	
+
 	private String getJobListPath = "/jobs";
-	
+
 	private OperationValidator validator;
-    
-    private URL getJobListURL;
-    
-    private static String urlSchema="https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/jobList.yaml";    
-    
+
+	private URL getJobListURL;
+
+	private static String urlSchema = "https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/jobList.yaml";
+
 	@BeforeClass
-	public void setup() {		
-		String jobListEndpointString = rootUri.toString() + getJobListPath;		
-		try {		
+	public void setup() {
+		String jobListEndpointString = rootUri.toString() + getJobListPath;
+		try {
 			openApi3 = new OpenApi3Parser().parse(specURL, false);
 			addServerUnderTest(openApi3);
-		    final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
-		    final Operation operation = openApi3.getOperationById(OPERATION_ID);
-		    validator = new OperationValidator(openApi3, path, operation);
-		    getJobListURL = new URL(jobListEndpointString);
-		} catch (MalformedURLException | ResolutionException | ValidationException e) {	
-			
-			Assert.fail("Could not set up endpoint: " + jobListEndpointString + ". Exception: " + e.getLocalizedMessage());
+			final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
+			final Operation operation = openApi3.getOperationById(OPERATION_ID);
+			validator = new OperationValidator(openApi3, path, operation);
+			getJobListURL = new URL(jobListEndpointString);
 		}
-	}
+		catch (MalformedURLException | ResolutionException | ValidationException e) {
 
+			Assert.fail(
+					"Could not set up endpoint: " + jobListEndpointString + ". Exception: " + e.getLocalizedMessage());
+		}
+	}
 
 	/**
 	 * <pre>
@@ -107,26 +109,28 @@ public void setup() {
 	 * </pre>
 	 */
 	@Test(description = "Implements Requirement /req/job-list/job-list-op ", groups = "jobList")
-	public void testJobList() {		
+	public void testJobList() {
 		final ValidationData<Void> data = new ValidationData<>();
-		try { 
-		
-			HttpClient client = HttpClientBuilder.create().build();				
-			HttpUriRequest request = new HttpGet(getJobListURL.toString());			
-			request.setHeader("Accept", "application/json");		
-		    this.reqEntity = request;	    
-			HttpResponse httpResponse = client.execute(request);			
-			StringWriter writer = new StringWriter();			
-			String encoding = StandardCharsets.UTF_8.name();		
+		try {
+
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(getJobListURL.toString());
+			request.setHeader("Accept", "application/json");
+			this.reqEntity = request;
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
 			String responsePayload = writer.toString();
 			this.rspEntity = responsePayload;
-			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);		
-			ArrayNode arrayNode = (ArrayNode) responseNode.get("jobs");	
-			Assert.assertTrue(arrayNode.size()>0,"No processes listed at "+getJobListURL.toString());
+			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
+			ArrayNode arrayNode = (ArrayNode) responseNode.get("jobs");
+			Assert.assertTrue(arrayNode.size() > 0, "No processes listed at " + getJobListURL.toString());
 
-		} catch (Exception e) {
-			Assert.fail("jobList.testjobList(): An exception occured when trying to retrieve the job list from "+getJobListURL.toString());
+		}
+		catch (Exception e) {
+			Assert.fail("jobList.testjobList(): An exception occured when trying to retrieve the job list from "
+					+ getJobListURL.toString());
 		}
 	}
 
@@ -135,11 +139,11 @@ public void testJobList() {
 	 * Abstract test A.71: /conf/job-list/job-list-success
 	 * Test Purpose: Validate that the job list content complies with the required structure and contents.
 	 * Requirement: /req/job-list/job-list-success
-	 * Test Method: 
+	 * Test Method:
 	 * |===
-	 * 
+	 *
 	 * 1. Validate that a document was returned with an HTTP status code of 200.
-	 * 
+	 *
 	 * 2. Validate the job list content for all supported media types using the resources and tests identified in Table A.10
 	 * |===
 	 * </pre>
@@ -147,29 +151,33 @@ public void testJobList() {
 	@Test(description = "Implements Requirement /req/job-list/job-list-success ", groups = "jobList")
 	public void testJobListSuccess() {
 		final ValidationData<Void> data = new ValidationData<>();
-		try { 
+		try {
 			HttpClient client = HttpClientBuilder.create().build();
 			HttpUriRequest request = new HttpGet(getJobListURL.toString());
 			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
+			this.reqEntity = request;
 			HttpResponse httpResponse = client.execute(request);
 			StringWriter writer = new StringWriter();
 			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
 			String responsePayload = writer.toString();
-                        this.rspEntity = responsePayload;
+			this.rspEntity = responsePayload;
 			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
 			Body body = Body.from(responseNode);
 			Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, contentType.getValue())
-					.build();
-			validator.validateResponse(response, data);			
-			
-			assertTrue( validateResponseAgainstSchema(JobList.urlSchema,responsePayload),
-				    "The response document failed validation against: "+JobList.urlSchema+ " ");	
-	
-		} catch (Exception e) {
-			Assert.fail("jobList.testjobListSuccess(): An exception occured when trying to retrieve the processes list from "+getJobListURL.toString());
+			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+					.header(CONTENT_TYPE, contentType.getValue()).build();
+			validator.validateResponse(response, data);
+
+			assertTrue(validateResponseAgainstSchema(JobList.urlSchema, responsePayload),
+					"The response document failed validation against: " + JobList.urlSchema + " ");
+
+		}
+		catch (Exception e) {
+			Assert.fail(
+					"jobList.testjobListSuccess(): An exception occured when trying to retrieve the processes list from "
+							+ getJobListURL.toString());
 		}
 	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/jobs/Jobs.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/jobs/Jobs.java
index e1f7181..6a93c53 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/jobs/Jobs.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/jobs/Jobs.java
@@ -61,40 +61,61 @@
 
 /**
  *
- * A.2.6. JobList  {root}/jobs
+ * A.2.6. JobList {root}/jobs
  *
  * @author <a href="mailto:b.pross@52north.org">Benjamin Pross</a>
  */
 public class Jobs extends CommonFixture {
 
 	private static final String OPERATION_ID_GET_JOBS = "getJobs";
+
 	private static final String OPERATION_ID_GET_STATUS = "getStatus";
+
 	private static final String OPERATION_ID_GET_RESULT = "getResult";
+
 	private static final String OPERATION_ID_EXECUTE = "execute";
+
 	private static final String JOB_CONTROL_OPTIONS_KEY = "jobControlOptions";
+
 	private static final Object JOB_CONTROL_OPTIONS_SYNC = "sync-execute";
+
 	private static final Object JOB_CONTROL_OPTIONS_ASYNC = "async-execute";
+
 	private static final String SCHEMA_KEY = "schema";
+
 	private static final String RESPONSE_KEY = "response";
+
 	private static final String RESPONSE_VALUE_DOCUMENT = "document";
+
 	private static final String RESPONSE_VALUE_RAW = "raw";
+
 	private static final String TEST_STRING_INPUT = "teststring";
+
 	private static final Object TYPE_DEFINITION_OBJECT = "object";
+
 	private static final String EXCEPTION_SCHEMA_URL = "https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/exception.yaml";
+
 	private static final String STATUS_SCHEMA_URL = "https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/statusInfo.yaml";
+
 	private static final String ASYNC_MODE_NOT_SUPPORTED_MESSAGE = "This test is skipped because the server has not declared support for asynchronous execution mode.";
+
 	private static final String GEOTIFF_URL = "https://raw.githubusercontent.com/opengeospatial/ets-ogcapi-processes10/master/src/main/resources/org/opengis/cite/testdata/testgeotiff.tiff";
-    private static final Object TYPE_DEFINITION_ARRAY = "array";
-    private static final CharSequence ISSUE_54_MESSAGE_TEXT = "More than 1 schema is valid.";
-    private int attempts = 0;
-    private static final int MAX_ATTEMPTS = 4;
-    private static final int ASYNC_LOOP_WAITING_PERIOD = 5000;
+
+	private static final Object TYPE_DEFINITION_ARRAY = "array";
+
+	private static final CharSequence ISSUE_54_MESSAGE_TEXT = "More than 1 schema is valid.";
+
+	private int attempts = 0;
+
+	private static final int MAX_ATTEMPTS = 4;
+
+	private static final int ASYNC_LOOP_WAITING_PERIOD = 5000;
 
 	private OpenApi3 openApi3;
 
 	private String getJobsListPath = "/jobs";
 
-//	private String getJobPath = "/jobs";
+	// private String getJobPath = "/jobs";
 
 	private String getProcessListPath = "/processes";
 
@@ -106,15 +127,15 @@ public class Jobs extends CommonFixture {
 
 	private OperationValidator executeValidator;
 
-    private URL getJobsListURL;
+	private URL getJobsListURL;
 
-    private URL getProcessesListURL;
+	private URL getProcessesListURL;
 
-    private URL getInvalidJobURL;
+	private URL getInvalidJobURL;
 
-    private URL getInvalidJobResultURL;
+	private URL getInvalidJobResultURL;
 
-    private String echoProcessId;
+	private String echoProcessId;
 
 	private String echoProcessPath;
 
@@ -124,7 +145,7 @@ public class Jobs extends CommonFixture {
 
 	private ObjectMapper objectMapper = new ObjectMapper();
 
-//	private CloseableHttpClient client;
+	// private CloseableHttpClient client;
 
 	private String executeEndpoint;
 
@@ -134,19 +155,20 @@ public class Jobs extends CommonFixture {
 
 	enum SupportedExecutionModes {
 
-	    /**
-	     * Only synchronous execution mode is supported.
-	     */
-	    ONLY_SYNC,
-	    /**
-	     * Only asynchronous execution mode is supported.
-	     */
-	    ONLY_ASYNC,
-	    /**
-	     * Either execution mode is supported.
-	     */
-	    EITHER;
-    }
+		/**
+		 * Only synchronous execution mode is supported.
+		 */
+		ONLY_SYNC,
+		/**
+		 * Only asynchronous execution mode is supported.
+		 */
+		ONLY_ASYNC,
+		/**
+		 * Either execution mode is supported.
+		 */
+		EITHER;
+
+	}
 
 	@BeforeClass
 	public void setup(ITestContext testContext) {
@@ -155,63 +177,62 @@ public void setup(ITestContext testContext) {
 		String processListEndpointString = rootUri.toString() + getProcessListPath;
 		String jobsListEndpointString = rootUri.toString() + getJobsListPath;
 		try {
-			echoProcessId = (String) testContext.getSuite().getAttribute( SuiteAttribute.ECHO_PROCESS_ID.getName() );
-		    echoProcessPath = getProcessListPath + "/" + echoProcessId;
+			echoProcessId = (String) testContext.getSuite().getAttribute(SuiteAttribute.ECHO_PROCESS_ID.getName());
+			echoProcessPath = getProcessListPath + "/" + echoProcessId;
 			executeEndpoint = rootUri + echoProcessPath + "/execution";
-		    parseEchoProcess();
+			parseEchoProcess();
 			openApi3 = new OpenApi3Parser().parse(specURL, false);
-		    final Path path = openApi3.getPathItemByOperationId(OPERATION_ID_GET_JOBS);
-		    final Operation operation = openApi3.getOperationById(OPERATION_ID_GET_JOBS);
-		    getJobsValidator = new OperationValidator(openApi3, path, operation);
-		    final Path executePath = openApi3.getPathItemByOperationId(OPERATION_ID_EXECUTE);
-		    final Operation executeOperation = openApi3.getOperationById(OPERATION_ID_EXECUTE);
-		    executeValidator = new OperationValidator(openApi3, executePath, executeOperation);
-		    final Path getStatusPath = openApi3.getPathItemByOperationId(OPERATION_ID_GET_STATUS);
-		    final Operation getStatusOperation = openApi3.getOperationById(OPERATION_ID_GET_STATUS);
-		    getStatusValidator = new OperationValidator(openApi3, getStatusPath, getStatusOperation);
-		    final Path getResultPath = openApi3.getPathItemByOperationId(OPERATION_ID_GET_RESULT);
-		    final Operation getResultOperation = openApi3.getOperationById(OPERATION_ID_GET_RESULT);
-		    getResultValidator = new OperationValidator(openApi3, getResultPath, getResultOperation);
-		    getJobsListURL = new URL(jobsListEndpointString);
-		    getProcessesListURL = new URL(processListEndpointString);
-		    getInvalidJobURL = new URL(jobsListEndpointString + "/invalid-job-" + UUID.randomUUID());
-		    getInvalidJobResultURL = new URL(jobsListEndpointString + "/invalid-job-" + UUID.randomUUID() + "/results");
+			final Path path = openApi3.getPathItemByOperationId(OPERATION_ID_GET_JOBS);
+			final Operation operation = openApi3.getOperationById(OPERATION_ID_GET_JOBS);
+			getJobsValidator = new OperationValidator(openApi3, path, operation);
+			final Path executePath = openApi3.getPathItemByOperationId(OPERATION_ID_EXECUTE);
+			final Operation executeOperation = openApi3.getOperationById(OPERATION_ID_EXECUTE);
+			executeValidator = new OperationValidator(openApi3, executePath, executeOperation);
+			final Path getStatusPath = openApi3.getPathItemByOperationId(OPERATION_ID_GET_STATUS);
+			final Operation getStatusOperation = openApi3.getOperationById(OPERATION_ID_GET_STATUS);
+			getStatusValidator = new OperationValidator(openApi3, getStatusPath, getStatusOperation);
+			final Path getResultPath = openApi3.getPathItemByOperationId(OPERATION_ID_GET_RESULT);
+			final Operation getResultOperation = openApi3.getOperationById(OPERATION_ID_GET_RESULT);
+			getResultValidator = new OperationValidator(openApi3, getResultPath, getResultOperation);
+			getJobsListURL = new URL(jobsListEndpointString);
+			getProcessesListURL = new URL(processListEndpointString);
+			getInvalidJobURL = new URL(jobsListEndpointString + "/invalid-job-" + UUID.randomUUID());
+			getInvalidJobResultURL = new URL(jobsListEndpointString + "/invalid-job-" + UUID.randomUUID() + "/results");
 			clientBuilder = HttpClientBuilder.create();
-		} catch (Exception e) {		
+		}
+		catch (Exception e) {
 			Assert.fail("Could set up endpoint: " + processListEndpointString + ". Exception: " + e);
 		}
 	}
-	
-	private boolean echoProcessSupportsAsync()
-	{
+
+	private boolean echoProcessSupportsAsync() {
 		boolean supportsAsync = false;
 		try {
-		HttpClient client = HttpClientBuilder.create().build();
-		HttpUriRequest request = new HttpGet(rootUri + echoProcessPath);
-		request.setHeader("Accept", "application/json");
-		HttpResponse httpResponse = client.execute(request);
-		StringWriter writer = new StringWriter();
-		String encoding = StandardCharsets.UTF_8.name();
-		IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-		JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-		JsonNode inputsNode = responseNode.get("jobControlOptions");
-		
-		if(inputsNode instanceof ArrayNode) {
-			ArrayNode inputsArrayNode = (ArrayNode)inputsNode;
-			
-			for(int i = 0 ; i < inputsArrayNode.size(); i++)
-			{
-				if(inputsArrayNode.get(i).asText().equals("async-execute")) supportsAsync = true;
-			}
-			
-		} 
-		}
-		catch(Exception ex)
-		{
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(rootUri + echoProcessPath);
+			request.setHeader("Accept", "application/json");
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
+			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+			JsonNode inputsNode = responseNode.get("jobControlOptions");
+
+			if (inputsNode instanceof ArrayNode) {
+				ArrayNode inputsArrayNode = (ArrayNode) inputsNode;
+
+				for (int i = 0; i < inputsArrayNode.size(); i++) {
+					if (inputsArrayNode.get(i).asText().equals("async-execute"))
+						supportsAsync = true;
+				}
+
+			}
+		}
+		catch (Exception ex) {
 			ex.printStackTrace();
 		}
 		return supportsAsync;
-	}	
+	}
 
 	private void parseEchoProcess() {
 
@@ -225,9 +246,10 @@ private void parseEchoProcess() {
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
 			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
 			JsonNode inputsNode = responseNode.get("inputs");
-			if(inputsNode instanceof ArrayNode) {
-				ArrayNode inputsArrayNode = (ArrayNode)inputsNode;
-			} else {
+			if (inputsNode instanceof ArrayNode) {
+				ArrayNode inputsArrayNode = (ArrayNode) inputsNode;
+			}
+			else {
 				Iterator<String> inputNames = inputsNode.fieldNames();
 				while (inputNames.hasNext()) {
 					String id = (String) inputNames.next();
@@ -238,9 +260,10 @@ private void parseEchoProcess() {
 				}
 			}
 			JsonNode outputsNode = responseNode.get("outputs");
-			if(outputsNode instanceof ArrayNode) {
-				ArrayNode outputsArrayNode = (ArrayNode)outputsNode;
-			} else {
+			if (outputsNode instanceof ArrayNode) {
+				ArrayNode outputsArrayNode = (ArrayNode) outputsNode;
+			}
+			else {
 				Iterator<String> outputNames = outputsNode.fieldNames();
 				while (outputNames.hasNext()) {
 					String id = (String) outputNames.next();
@@ -251,31 +274,33 @@ private void parseEchoProcess() {
 				}
 			}
 			JsonNode jobControlOptionsNode = responseNode.get(JOB_CONTROL_OPTIONS_KEY);
-			if(jobControlOptionsNode != null && !jobControlOptionsNode.isMissingNode()) {
-				if(jobControlOptionsNode instanceof ArrayNode) {
+			if (jobControlOptionsNode != null && !jobControlOptionsNode.isMissingNode()) {
+				if (jobControlOptionsNode instanceof ArrayNode) {
 					ArrayNode jobControlOptionsArrayNode = (ArrayNode) jobControlOptionsNode;
 					boolean syncSupported = false;
 					boolean aSyncSupported = false;
 					for (int i = 0; i < jobControlOptionsArrayNode.size(); i++) {
 						JsonNode jobControlOptionsArrayChildNode = jobControlOptionsArrayNode.get(i);
-						if(jobControlOptionsArrayChildNode.asText().equals(JOB_CONTROL_OPTIONS_SYNC)) {
+						if (jobControlOptionsArrayChildNode.asText().equals(JOB_CONTROL_OPTIONS_SYNC)) {
 							syncSupported = true;
-						} else if(jobControlOptionsArrayChildNode.asText().equals(JOB_CONTROL_OPTIONS_ASYNC)) {
+						}
+						else if (jobControlOptionsArrayChildNode.asText().equals(JOB_CONTROL_OPTIONS_ASYNC)) {
 							aSyncSupported = true;
 						}
 					}
-					if(syncSupported && !aSyncSupported) {
+					if (syncSupported && !aSyncSupported) {
 						supportedExecutionModes = SupportedExecutionModes.ONLY_SYNC;
 					}
-					if(aSyncSupported && !syncSupported) {
+					if (aSyncSupported && !syncSupported) {
 						supportedExecutionModes = SupportedExecutionModes.ONLY_ASYNC;
 					}
-					if(syncSupported && aSyncSupported) {
+					if (syncSupported && aSyncSupported) {
 						supportedExecutionModes = SupportedExecutionModes.EITHER;
 					}
 				}
 			}
-		} catch (IOException e) {
+		}
+		catch (IOException e) {
 			Assert.fail("Could not parse echo process.");
 		}
 
@@ -285,7 +310,7 @@ private ObjectNode createExecuteJsonNode(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		for (Input input : inputs) {
 			addInput(input, inputsNode);
 		}
@@ -293,8 +318,8 @@ private ObjectNode createExecuteJsonNode(String echoProcessId) {
 			addOutput(output, outputsNode);
 		}
 		executeNode.set("inputs", inputsNode);
-		if(inputsNode.isEmpty()) {
-		    throw new AssertionError("No supported input found. Only plain string input is supported.");
+		if (inputsNode.isEmpty()) {
+			throw new AssertionError("No supported input found. Only plain string input is supported.");
 		}
 		executeNode.set("outputs", outputsNode);
 		return executeNode;
@@ -311,11 +336,12 @@ private void addInput(Input input, ObjectNode inputsNode) {
 		ObjectNode inputNode = objectMapper.createObjectNode();
 
 		for (Type type : types) {
-			if(type.getTypeDefinition().equals("string")) {
-			        if(input.getFormat() == null && type.getContentMediaType() == null) {
-	                           inputsNode.set(input.getId(), new TextNode(TEST_STRING_INPUT));
-			        }
-			} else if(input.isBbox()) {
+			if (type.getTypeDefinition().equals("string")) {
+				if (input.getFormat() == null && type.getContentMediaType() == null) {
+					inputsNode.set(input.getId(), new TextNode(TEST_STRING_INPUT));
+				}
+			}
+			else if (input.isBbox()) {
 				inputNode.set("crs", new TextNode("urn:ogc:def:crs:EPSG:6.6:4326"));
 				ArrayNode arrayNode = objectMapper.createArrayNode();
 				arrayNode.add(345345345);
@@ -324,14 +350,15 @@ private void addInput(Input input, ObjectNode inputsNode) {
 				arrayNode.add(345345345);
 				inputNode.set("bbox", arrayNode);
 				inputsNode.set(input.getId(), inputNode);
-			} else if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
-                            addObjectInput(input, inputsNode);
-                        }
+			}
+			else if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				addObjectInput(input, inputsNode);
+			}
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 17: /conf/core/job-creation-auto-execution-mode
 	* Test Purpose: Validate that the server correctly handles the execution mode for a process.
 	* Requirement: /req/core/job-creation-op
@@ -343,38 +370,40 @@ private void addInput(Input input, ObjectNode inputsNode) {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-op ")
 	public void testJobCreationAutoExecutionMode() {
-		
-		if(echoProcessSupportsAsync())
-		{			
-			//create async job
+
+		if (echoProcessSupportsAsync()) {
+			// create async job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			try {
-				//send execute request with prefer header
+				// send execute request with prefer header
 				HttpResponse httpResponse = sendPostRequestASync(executeNode);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
-				if(supportedExecutionModes.equals(SupportedExecutionModes.ONLY_SYNC)) {
+				if (supportedExecutionModes.equals(SupportedExecutionModes.ONLY_SYNC)) {
 					Assert.assertTrue(statusCode == 200, "Got unexpected status code: " + statusCode);
 				}
-				if(supportedExecutionModes.equals(SupportedExecutionModes.ONLY_ASYNC)) {
+				if (supportedExecutionModes.equals(SupportedExecutionModes.ONLY_ASYNC)) {
 					Assert.assertTrue(statusCode == 201, "Got unexpected status code: " + statusCode);
 				}
-				if(supportedExecutionModes.equals(SupportedExecutionModes.EITHER)) {
-					Assert.assertTrue(statusCode == 201 || statusCode == 200, "Got unexpected status code: " + statusCode);
+				if (supportedExecutionModes.equals(SupportedExecutionModes.EITHER)) {
+					Assert.assertTrue(statusCode == 201 || statusCode == 200,
+							"Got unexpected status code: " + statusCode);
 				}
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
 		}
 		else {
-			throw new SkipException(Jobs.ASYNC_MODE_NOT_SUPPORTED_MESSAGE+" Also note that the specification does not mandate that servers create a job as a result of executing a process synchronously (See Clause 7.11.4 of OGC 18-062r2)");
+			throw new SkipException(Jobs.ASYNC_MODE_NOT_SUPPORTED_MESSAGE
+					+ " Also note that the specification does not mandate that servers create a job as a result of executing a process synchronously (See Clause 7.11.4 of OGC 18-062r2)");
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 18: /conf/core/job-creation-default-execution-mode
 	* Test Purpose: Validate that the server correctly handles the default execution mode for a process.
 	* Requirement: /req/core/job-creation-op
@@ -385,29 +414,30 @@ public void testJobCreationAutoExecutionMode() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-op ")
 	public void testJobCreationDefaultExecutionMode() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		try {
-			//send execute request without prefer header
+			// send execute request without prefer header
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
-			if(supportedExecutionModes.equals(SupportedExecutionModes.ONLY_SYNC) ||
-					supportedExecutionModes.equals(SupportedExecutionModes.EITHER)) {
+			if (supportedExecutionModes.equals(SupportedExecutionModes.ONLY_SYNC)
+					|| supportedExecutionModes.equals(SupportedExecutionModes.EITHER)) {
 				Assert.assertTrue(statusCode == 200, "Got unexpected status code: " + statusCode);
 			}
-			if(supportedExecutionModes.equals(SupportedExecutionModes.ONLY_ASYNC)) {
+			if (supportedExecutionModes.equals(SupportedExecutionModes.ONLY_ASYNC)) {
 				Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
 			}
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 27: /conf/core/job-creation-default-outputs
 	* Test Purpose: Validate that the server correctly handles the case where no `outputs` parameter is specified on an execute request.
 	* Requirement: /req/core/job-creation-op
@@ -418,16 +448,17 @@ public void testJobCreationDefaultExecutionMode() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-op ")
 	public void testJobCreationDefaultOutputs() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeNoOutputs(echoProcessId);
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
@@ -435,7 +466,7 @@ public void testJobCreationDefaultOutputs() {
 	private JsonNode createExecuteJsonNodeNoOutputs(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		for (Input input : inputs) {
 			addInput(input, inputsNode);
 		}
@@ -444,7 +475,7 @@ private JsonNode createExecuteJsonNodeNoOutputs(String echoProcessId) {
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 23: /conf/core/job-creation-input-array
 	* Test Purpose: Verify that the server correctly recognizes the encoding of parameter values for input parameters with a maximum cardinality greater than one.
 	* Requirement: /req/core/job-creation-input-array
@@ -456,23 +487,24 @@ private JsonNode createExecuteJsonNodeNoOutputs(String echoProcessId) {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-array ")
 	public void testJobCreationInputArray() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeWithInputArray(echoProcessId);
 		TestSuiteLogger.log(Level.INFO, executeNode.toString());
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 27: /conf/core/job-creation-input-inline-bbox
 	* Test Purpose: Validate that inputs with a bounding box schema encoded in-line in an execute request are correctly processed.
 	* Requirement: /req/core/job-creation-input-inline-bbox
@@ -480,23 +512,24 @@ public void testJobCreationInputArray() {
 	* 1.  For each identified process construct an execute request according to test ats_core_job-creation-request,/conf/core/job-creation-request taking care to encode values for the identified bounding box inputs in-line in the execute request
 	* 2.  Verify that each process executes successfully according to the ats_job-creation-success,relevant requirement based on the combination of execute parameters
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-inline-bbox ")
 	public void testJobCreationInputInlineBbox() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeWithBBox(echoProcessId);
 		TestSuiteLogger.log(Level.INFO, executeNode.toString());
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 26: /conf/core/job-creation-input-inline-binary
 	* Test Purpose: Validate that binary input values encoded as base-64 string in-line in an execute request are correctly processes.
 	* Requirement: /req/core/job-creation-input-binary
@@ -506,23 +539,24 @@ public void testJobCreationInputInlineBbox() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-binary ")
 	public void testJobCreationInputInlineBinary() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeWithBinaryInput(echoProcessId);
 		TestSuiteLogger.log(Level.INFO, executeNode.toString());
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 25: /conf/core/job-creation-input-inline-mixed
 	* Test Purpose: Validate that inputs of mixed content encoded in-line in an execute request are correctly processed.
 	* Requirement: /req/core/job-creation-input-inline-mixed
@@ -532,23 +566,24 @@ public void testJobCreationInputInlineBinary() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-inline-mixed ")
 	public void testJobCreationInputInlineMixed() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeWithMixedInput(echoProcessId);
 		TestSuiteLogger.log(Level.INFO, executeNode.toString());
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 23: /conf/core/job-creation-input-inline-object
 	* Test Purpose: Validate that inputs with a complex object schema encoded in-line in an execute request are correctly processed.
 	* Requirement: /req/core/job-creation-input-inline-object
@@ -559,89 +594,89 @@ public void testJobCreationInputInlineMixed() {
 	*
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-inline-object ")
 	public void testJobCreationInputInlineObject() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNodeWithObject(echoProcessId);
 		try {
-			HttpResponse httpResponse =sendPostRequestSync(executeNode);
+			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
-        private JsonNode createExecuteJsonNodeWithBBox(String echoProcessId) {
-                ObjectNode executeNode = objectMapper.createObjectNode();
-                ObjectNode inputsNode = objectMapper.createObjectNode();
-                ObjectNode outputsNode = objectMapper.createObjectNode();
-                boolean foundBBoxInput = false;
-                for (Input input : inputs) {                    
-                        boolean inputIsBBox = false;
-                        if(foundBBoxInput) {
-                            addInput(input, inputsNode);
-                            continue;
-                        }
-                        if(input.isBbox()) {
-                            addBBoxInput(input, inputsNode);
-                            foundBBoxInput = true;
-                            inputIsBBox = true;
-                            continue;
-                        }
-                        if(!inputIsBBox) {
-                            addInput(input, inputsNode);
-                        }
-                }
-                for (Output output : outputs) {
-                        if(output.isBbox()) {
-                        addOutput(output, outputsNode);
-                        }
-                }
-                if(!foundBBoxInput) {
-                    throw new SkipException("No input of type bounding box found.");
-                }
-                executeNode.set("inputs", inputsNode);
-                executeNode.set("outputs", outputsNode);
-                return executeNode;
-        }
-
-	private void addBBoxInput(Input input,
-                ObjectNode inputsNode) {
-            ObjectNode inputObjectNode = objectMapper.createObjectNode();
-            ArrayNode bboxArrayNode = objectMapper.createArrayNode();
-            bboxArrayNode.add(51.9);
-            bboxArrayNode.add(7);
-            bboxArrayNode.add(52);
-            bboxArrayNode.add(7.1);
-            inputObjectNode.set("bbox", bboxArrayNode);
-            inputObjectNode.set("crs", new TextNode("http://www.opengis.net/def/crs/OGC/1.3/CRS84"));
-            inputsNode.set(input.getId(), inputObjectNode);            
-        }
-
-    private JsonNode createExecuteJsonNodeWithObject(String echoProcessId) {
+	private JsonNode createExecuteJsonNodeWithBBox(String echoProcessId) {
+		ObjectNode executeNode = objectMapper.createObjectNode();
+		ObjectNode inputsNode = objectMapper.createObjectNode();
+		ObjectNode outputsNode = objectMapper.createObjectNode();
+		boolean foundBBoxInput = false;
+		for (Input input : inputs) {
+			boolean inputIsBBox = false;
+			if (foundBBoxInput) {
+				addInput(input, inputsNode);
+				continue;
+			}
+			if (input.isBbox()) {
+				addBBoxInput(input, inputsNode);
+				foundBBoxInput = true;
+				inputIsBBox = true;
+				continue;
+			}
+			if (!inputIsBBox) {
+				addInput(input, inputsNode);
+			}
+		}
+		for (Output output : outputs) {
+			if (output.isBbox()) {
+				addOutput(output, outputsNode);
+			}
+		}
+		if (!foundBBoxInput) {
+			throw new SkipException("No input of type bounding box found.");
+		}
+		executeNode.set("inputs", inputsNode);
+		executeNode.set("outputs", outputsNode);
+		return executeNode;
+	}
+
+	private void addBBoxInput(Input input, ObjectNode inputsNode) {
+		ObjectNode inputObjectNode = objectMapper.createObjectNode();
+		ArrayNode bboxArrayNode = objectMapper.createArrayNode();
+		bboxArrayNode.add(51.9);
+		bboxArrayNode.add(7);
+		bboxArrayNode.add(52);
+		bboxArrayNode.add(7.1);
+		inputObjectNode.set("bbox", bboxArrayNode);
+		inputObjectNode.set("crs", new TextNode("http://www.opengis.net/def/crs/OGC/1.3/CRS84"));
+		inputsNode.set(input.getId(), inputObjectNode);
+	}
+
+	private JsonNode createExecuteJsonNodeWithObject(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundObjectInput = false;
 		for (Input input : inputs) {
 			boolean inputIsObject = false;
 			List<Type> types = input.getTypes();
-			if(foundObjectInput) {
+			if (foundObjectInput) {
 				addInput(input, inputsNode);
 				continue;
 			}
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
 					addObjectInput(input, inputsNode);
 					foundObjectInput = true;
 					inputIsObject = true;
 					continue;
 				}
 			}
-			if(!inputIsObject) {
+			if (!inputIsObject) {
 				addInput(input, inputsNode);
 			}
 		}
@@ -657,151 +692,153 @@ private JsonNode createExecuteJsonNodeWithInputArray(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-                boolean foundArrayInput = false;
-		for (Input input : inputs) {                  
-		    boolean inputIsArray = false;
-                    if(foundArrayInput) {
-                        addInput(input, inputsNode);
-                        continue;
-                    }
+		boolean foundArrayInput = false;
+		for (Input input : inputs) {
+			boolean inputIsArray = false;
+			if (foundArrayInput) {
+				addInput(input, inputsNode);
+				continue;
+			}
 			List<Type> types = input.getTypes();
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_ARRAY)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_ARRAY)) {
 					addArrayInput(input, inputsNode);
 					foundArrayInput = true;
 					inputIsArray = true;
 					continue;
 				}
-			}                    
-			if(!inputIsArray) {
-                            addInput(input, inputsNode);
-                        }
+			}
+			if (!inputIsArray) {
+				addInput(input, inputsNode);
+			}
 		}
 		boolean foundArrayOutput = false;
 		for (Output output : outputs) {
-		    if(foundArrayOutput) {
-		        break;
-		    }
-                    List<Type> types = output.getTypes();
-                    if(types == null) {
-                        continue;
-                    }
-                    for (Type type : types) {
-                            if(type.getTypeDefinition().equals(TYPE_DEFINITION_ARRAY)) {
-                                    addOutput(output, outputsNode);
-                                    foundArrayOutput = true;
-                                    break;
-                            }
-                    }
-                }
-		if(!foundArrayInput) {
-		    throw new SkipException("No input of type array found.");
+			if (foundArrayOutput) {
+				break;
+			}
+			List<Type> types = output.getTypes();
+			if (types == null) {
+				continue;
+			}
+			for (Type type : types) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_ARRAY)) {
+					addOutput(output, outputsNode);
+					foundArrayOutput = true;
+					break;
+				}
+			}
+		}
+		if (!foundArrayInput) {
+			throw new SkipException("No input of type array found.");
 		}
 		executeNode.set("inputs", inputsNode);
 		executeNode.set("outputs", outputsNode);
 		return executeNode;
 	}
 
-        private void addArrayInput(Input input,
-                ObjectNode inputsNode) {
-            Optional<Type> firstItemType = input.getTypes().stream().filter(p -> p != null)
-                    .filter(p -> !p.getTypeDefinition().equals("array")).findFirst();
-            try {
-                String itemType = firstItemType.get().getTypeDefinition();
-                ArrayNode arrayNode = objectMapper.createArrayNode();
-                switch (itemType) {
-                case "integer":
-                    arrayNode.add(1);
-                    arrayNode.add(2);
-                    arrayNode.add(3);
-                    break;
-                case "double":
-                    arrayNode.add(1.1);
-                    arrayNode.add(2.2);
-                    arrayNode.add(3.3);
-                    break;
-                case "float":
-                    arrayNode.add(1.1f);
-                    arrayNode.add(2.2f);
-                    arrayNode.add(3.3f);
-                    break;
-                case "string":
-                    arrayNode.add("test1");
-                    arrayNode.add("test2");
-                    arrayNode.add("test3");
-                    break;
-                default:
-                    break;
-                }
-                inputsNode.set(input.getId(), arrayNode);
-            } catch (Exception e) {
-                throw new NoSuchElementException(String.format("No item type for array input \"%s\" specified.", input.getId()));
-            }
-        }
-
-        private void addBinaryInput(Input input, ObjectNode inputsNode) {
-                List<Type> types = input.getTypes();
-                ObjectNode inputNode = objectMapper.createObjectNode();
-                byte[] inputFileAsByteArray = null;
-                try {
-                    URL fileUrl = getClass().getClassLoader().getResource("org/opengis/cite/testdata/testgeotiff.tiff");
-                    File inputFile = new File(fileUrl.getFile());
-                    InputStream in = new FileInputStream(inputFile);
-                    inputFileAsByteArray = new byte[(int)inputFile.length()];
-                    in.read(inputFileAsByteArray);
-                    in.close();
-                } catch (IOException e) {
-                    return;
-                }
-                String base64EncodedString = Base64.encodeBase64String(inputFileAsByteArray);
-                
-                inputNode.set("value", new TextNode(base64EncodedString));
-                                
-                ObjectNode formatNode = objectMapper.createObjectNode();
-                
-                for (Type type : types) {
-                        if(type.getTypeDefinition().equals("string")) {
-                                if(type.getContentMediaType() != null && type.getContentMediaType().contains("tiff"))
-                                formatNode.set("mediaType", new TextNode(type.getContentMediaType()));
-                        }
-                }
-                formatNode.set("encoding", new TextNode("base64"));
-                
-                inputNode.set("format", formatNode);
-                
-                inputsNode.set(input.getId(), inputNode);
-        }
-
-    private JsonNode createExecuteJsonNodeWithBinaryInput(String echoProcessId) {
+	private void addArrayInput(Input input, ObjectNode inputsNode) {
+		Optional<Type> firstItemType = input.getTypes().stream().filter(p -> p != null)
+				.filter(p -> !p.getTypeDefinition().equals("array")).findFirst();
+		try {
+			String itemType = firstItemType.get().getTypeDefinition();
+			ArrayNode arrayNode = objectMapper.createArrayNode();
+			switch (itemType) {
+			case "integer":
+				arrayNode.add(1);
+				arrayNode.add(2);
+				arrayNode.add(3);
+				break;
+			case "double":
+				arrayNode.add(1.1);
+				arrayNode.add(2.2);
+				arrayNode.add(3.3);
+				break;
+			case "float":
+				arrayNode.add(1.1f);
+				arrayNode.add(2.2f);
+				arrayNode.add(3.3f);
+				break;
+			case "string":
+				arrayNode.add("test1");
+				arrayNode.add("test2");
+				arrayNode.add("test3");
+				break;
+			default:
+				break;
+			}
+			inputsNode.set(input.getId(), arrayNode);
+		}
+		catch (Exception e) {
+			throw new NoSuchElementException(
+					String.format("No item type for array input \"%s\" specified.", input.getId()));
+		}
+	}
+
+	private void addBinaryInput(Input input, ObjectNode inputsNode) {
+		List<Type> types = input.getTypes();
+		ObjectNode inputNode = objectMapper.createObjectNode();
+		byte[] inputFileAsByteArray = null;
+		try {
+			URL fileUrl = getClass().getClassLoader().getResource("org/opengis/cite/testdata/testgeotiff.tiff");
+			File inputFile = new File(fileUrl.getFile());
+			InputStream in = new FileInputStream(inputFile);
+			inputFileAsByteArray = new byte[(int) inputFile.length()];
+			in.read(inputFileAsByteArray);
+			in.close();
+		}
+		catch (IOException e) {
+			return;
+		}
+		String base64EncodedString = Base64.encodeBase64String(inputFileAsByteArray);
+
+		inputNode.set("value", new TextNode(base64EncodedString));
+
+		ObjectNode formatNode = objectMapper.createObjectNode();
+
+		for (Type type : types) {
+			if (type.getTypeDefinition().equals("string")) {
+				if (type.getContentMediaType() != null && type.getContentMediaType().contains("tiff"))
+					formatNode.set("mediaType", new TextNode(type.getContentMediaType()));
+			}
+		}
+		formatNode.set("encoding", new TextNode("base64"));
+
+		inputNode.set("format", formatNode);
+
+		inputsNode.set(input.getId(), inputNode);
+	}
+
+	private JsonNode createExecuteJsonNodeWithBinaryInput(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-                boolean foundBinaryInput = false;
-                for (Input input : inputs) {                    
-                        boolean inputIsBinary = false;
-                        if(foundBinaryInput) {
-                            addInput(input, inputsNode);
-                            continue;
-                        }
-                        List<Type> types = input.getTypes();
-                        for (Type type : types) {
-                                if(type.isBinary()) {
-                                        addBinaryInput(input, inputsNode);
-                                        foundBinaryInput = true;
-                                        inputIsBinary = true;
-                                        continue;
-                                }
-                        }
-                        if(!inputIsBinary) {
-                            addInput(input, inputsNode);
-                        }
-                }
+		boolean foundBinaryInput = false;
+		for (Input input : inputs) {
+			boolean inputIsBinary = false;
+			if (foundBinaryInput) {
+				addInput(input, inputsNode);
+				continue;
+			}
+			List<Type> types = input.getTypes();
+			for (Type type : types) {
+				if (type.isBinary()) {
+					addBinaryInput(input, inputsNode);
+					foundBinaryInput = true;
+					inputIsBinary = true;
+					continue;
+				}
+			}
+			if (!inputIsBinary) {
+				addInput(input, inputsNode);
+			}
+		}
 		for (Output output : outputs) {
 			addOutput(output, outputsNode);
 		}
-                if(inputsNode.isEmpty()) {
-                    throw new SkipException("No input of type binary found.");
-                }
+		if (inputsNode.isEmpty()) {
+			throw new SkipException("No input of type binary found.");
+		}
 		executeNode.set("inputs", inputsNode);
 		executeNode.set("outputs", outputsNode);
 		return executeNode;
@@ -811,24 +848,24 @@ private JsonNode createExecuteJsonNodeWithMixedInput(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundObjectInput = false;
 		for (Input input : inputs) {
 			boolean inputIsObject = false;
 			List<Type> types = input.getTypes();
-			if(foundObjectInput) {
+			if (foundObjectInput) {
 				addInput(input, inputsNode);
 				continue;
 			}
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
 					addObjectInput(input, inputsNode);
 					foundObjectInput = true;
 					inputIsObject = true;
 					continue;
 				}
 			}
-			if(!inputIsObject) {
+			if (!inputIsObject) {
 				addInput(input, inputsNode);
 			}
 		}
@@ -844,24 +881,24 @@ private JsonNode createExecuteJsonNodeRawMixedMulti(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundObjectInput = false;
 		for (Input input : inputs) {
 			boolean inputIsObject = false;
 			List<Type> types = input.getTypes();
-			if(foundObjectInput) {
+			if (foundObjectInput) {
 				addInput(input, inputsNode);
 				continue;
 			}
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
 					addObjectInput(input, inputsNode);
 					foundObjectInput = true;
 					inputIsObject = true;
 					continue;
 				}
 			}
-			if(!inputIsObject) {
+			if (!inputIsObject) {
 				addInput(input, inputsNode);
 			}
 		}
@@ -877,24 +914,24 @@ private JsonNode createExecuteJsonNodeRawRef(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundObjectInput = false;
 		for (Input input : inputs) {
 			boolean inputIsObject = false;
 			List<Type> types = input.getTypes();
-			if(foundObjectInput) {
+			if (foundObjectInput) {
 				addInput(input, inputsNode);
 				continue;
 			}
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
 					addObjectInput(input, inputsNode);
 					foundObjectInput = true;
 					inputIsObject = true;
 					continue;
 				}
 			}
-			if(!inputIsObject) {
+			if (!inputIsObject) {
 				addInput(input, inputsNode);
 			}
 		}
@@ -910,24 +947,24 @@ private JsonNode createExecuteJsonNodeRawValueMulti(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundObjectInput = false;
 		for (Input input : inputs) {
 			boolean inputIsObject = false;
 			List<Type> types = input.getTypes();
-			if(foundObjectInput) {
+			if (foundObjectInput) {
 				addInput(input, inputsNode);
 				continue;
 			}
 			for (Type type : types) {
-				if(type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
+				if (type.getTypeDefinition().equals(TYPE_DEFINITION_OBJECT)) {
 					addObjectInput(input, inputsNode);
 					foundObjectInput = true;
 					inputIsObject = true;
 					continue;
 				}
 			}
-			if(!inputIsObject) {
+			if (!inputIsObject) {
 				addInput(input, inputsNode);
 			}
 		}
@@ -946,7 +983,7 @@ private void addObjectInput(Input input, ObjectNode inputsNode) {
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 21: /conf/core/job-creation-input-inline
 	* Test Purpose: Validate in-line process input values are validated against the corresponding schema from the process description.
 	* Requirement: /req/core/job-creation-input-inline
@@ -955,23 +992,23 @@ private void addObjectInput(Input input, ObjectNode inputsNode) {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-inline ")
 	public void testJobCreationInputInline() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
-	
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 22: /conf/core/job-creation-input-ref
 	* Test Purpose: Validate that input values specified by reference in an execute request are correctly processed.
 	* Requirement: /req/core/job-creation-input-ref
@@ -980,125 +1017,125 @@ public void testJobCreationInputInline() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-ref ")
 	public void testJobCreationInputRef() {
-		//create job
-		
+		// create job
+
 		JsonNode executeNode = createExecuteJsonNodeWithHref(echoProcessId);
-	
-		
+
 		ValidationData<Void> data = new ValidationData<>();
-	
-		    HttpResponse httpResponse = null;
-		    
+
+		HttpResponse httpResponse = null;
+
+		try {
+			httpResponse = sendPostRequestSync(executeNode);
+		}
+		catch (IOException e2) {
+			Assert.fail(e2.getLocalizedMessage());
+		}
+		Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
+		String responseContentTypeValue = responseContentType.getValue();
+		if (responseContentTypeValue == null) {
+			throw new SkipException("Got empty response content type header.");
+		}
+		if (!responseContentTypeValue.startsWith("multipart/related")) {
+
 			try {
-				httpResponse = sendPostRequestSync(executeNode);
-			} catch (IOException e2) {
-				Assert.fail(e2.getLocalizedMessage());
-			}
-                        Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-                        String responseContentTypeValue = responseContentType.getValue();
-                        if(responseContentTypeValue == null) {
-                            throw new SkipException("Got empty response content type header.");
-                        }
-			if(!responseContentTypeValue.startsWith("multipart/related")) {
-				
-				try {				
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
 				switch (statusCode) {
-                                case 200:                            
-                                    validateResponse(httpResponse, executeValidator, data);
-                                    break;
-                                case 201:
-                                    Header locationHeader = httpResponse.getFirstHeader("location");
-                                    String locationString = locationHeader.getValue();
-                                    httpResponse = sendGetRequest(locationString, "application/json");
-                                    validateResponse(httpResponse, getStatusValidator, data);
-                                    break;
-                                default:
-                                    Assert.fail("Got unexpected status code: " + statusCode);
-                                    break;
-                                }
-                                } catch (Exception e) {
-                                    Assert.fail(e.getLocalizedMessage());
-                            }
-		   }
-		   else if(responseContentTypeValue.startsWith("multipart/related")){
-                       
-                       StringWriter writer = new StringWriter();
-                       String encoding = StandardCharsets.UTF_8.name();
-                       
-                       try {
-                               IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-                       } catch (Exception e1) {
-                               Assert.fail(e1.getLocalizedMessage());
-                       }
-                       
-                       String responsePayload = writer.toString();
-			   
-			validateMultipartResponse(responsePayload,executeNode);	
-	
+				case 200:
+					validateResponse(httpResponse, executeValidator, data);
+					break;
+				case 201:
+					Header locationHeader = httpResponse.getFirstHeader("location");
+					String locationString = locationHeader.getValue();
+					httpResponse = sendGetRequest(locationString, "application/json");
+					validateResponse(httpResponse, getStatusValidator, data);
+					break;
+				default:
+					Assert.fail("Got unexpected status code: " + statusCode);
+					break;
+				}
+			}
+			catch (Exception e) {
+				Assert.fail(e.getLocalizedMessage());
+			}
+		}
+		else if (responseContentTypeValue.startsWith("multipart/related")) {
+
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
+
+			try {
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+			}
+			catch (Exception e1) {
+				Assert.fail(e1.getLocalizedMessage());
+			}
+
+			String responsePayload = writer.toString();
+
+			validateMultipartResponse(responsePayload, executeNode);
+
 		}
-			
 
 	}
 
 	private JsonNode createExecuteJsonNodeWithHref(String echoProcessId2) throws SkipException {
-            ObjectNode executeNode = objectMapper.createObjectNode();
-            ObjectNode inputsNode = objectMapper.createObjectNode();
-            ObjectNode outputsNode = objectMapper.createObjectNode();
-            boolean foundBinaryInput = false;
-            for (Input input : inputs) {
-                    boolean inputIsBinary = false;
-                    if(foundBinaryInput) {
-                        addInput(input, inputsNode);
-                        continue;
-                    }
-                    List<Type> types = input.getTypes();
-                    for (Type type : types) {
-                            if(type.isBinary()) {
-                                    addHrefInput(input, inputsNode);
-                                    foundBinaryInput = true;
-                                    inputIsBinary = true;
-                                    continue;
-                            }
-                    }
-                    if(!inputIsBinary) {
-                        addInput(input, inputsNode);
-                    }
-            }
-            for (Output output : outputs) {
-                    addOutput(output, outputsNode);
-            }
-            executeNode.set("inputs", inputsNode);
-            executeNode.set("outputs", outputsNode);
-            return executeNode;
-	}
-
-	private void addHrefInput(Input input,
-            ObjectNode inputsNode) {
-            List<Type> types = input.getTypes();
-            ObjectNode inputNode = objectMapper.createObjectNode();
-            inputNode.set("href", new TextNode(GEOTIFF_URL));
-                            
-            ObjectNode formatNode = objectMapper.createObjectNode();
-            
-            for (Type type : types) {
-                    if(type.getTypeDefinition().equals("string")) {
-                            if(type.getContentMediaType() != null && type.getContentMediaType().contains("tiff"))
-                            formatNode.set("mediaType", new TextNode(type.getContentMediaType()));
-                    }
-            }
-            
-            inputNode.set("format", formatNode);
-            
-            inputsNode.set(input.getId(), inputNode);
-        
-        }
-
-    /**
-	* <pre>
+		ObjectNode executeNode = objectMapper.createObjectNode();
+		ObjectNode inputsNode = objectMapper.createObjectNode();
+		ObjectNode outputsNode = objectMapper.createObjectNode();
+		boolean foundBinaryInput = false;
+		for (Input input : inputs) {
+			boolean inputIsBinary = false;
+			if (foundBinaryInput) {
+				addInput(input, inputsNode);
+				continue;
+			}
+			List<Type> types = input.getTypes();
+			for (Type type : types) {
+				if (type.isBinary()) {
+					addHrefInput(input, inputsNode);
+					foundBinaryInput = true;
+					inputIsBinary = true;
+					continue;
+				}
+			}
+			if (!inputIsBinary) {
+				addInput(input, inputsNode);
+			}
+		}
+		for (Output output : outputs) {
+			addOutput(output, outputsNode);
+		}
+		executeNode.set("inputs", inputsNode);
+		executeNode.set("outputs", outputsNode);
+		return executeNode;
+	}
+
+	private void addHrefInput(Input input, ObjectNode inputsNode) {
+		List<Type> types = input.getTypes();
+		ObjectNode inputNode = objectMapper.createObjectNode();
+		inputNode.set("href", new TextNode(GEOTIFF_URL));
+
+		ObjectNode formatNode = objectMapper.createObjectNode();
+
+		for (Type type : types) {
+			if (type.getTypeDefinition().equals("string")) {
+				if (type.getContentMediaType() != null && type.getContentMediaType().contains("tiff"))
+					formatNode.set("mediaType", new TextNode(type.getContentMediaType()));
+			}
+		}
+
+		inputNode.set("format", formatNode);
+
+		inputsNode.set(input.getId(), inputNode);
+
+	}
+
+	/**
+	 * <pre>
 	* Abstract Test null: /conf/core/job-creation-input-validation
 	* Test Purpose: Verify that the server correctly validates process input values according to the definition obtained from the sc_process_description,process description.
 	* Requirement: /req/core/job-creation-input-validation
@@ -1110,75 +1147,77 @@ private void addHrefInput(Input input,
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-input-validation ")
 	public void testJobCreationInputValidation() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		ValidationData<Void> data = new ValidationData<>();
-		
+
 		HttpResponse httpResponse = null;
 
-                try {
-                    httpResponse = sendPostRequestSync(executeNode);
-                } catch (IOException e) {
-                    Assert.fail(e.getLocalizedMessage());
-                }
-
-                Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-                String responseContentTypeValue = responseContentType.getValue();
-                if(responseContentTypeValue == null) {
-                    throw new SkipException("Got empty response content type header.");
-                }
-		
-		if(responseContentTypeValue.startsWith("multipart/related")){
-			if(responseContentType.getValue().startsWith("multipart/related")) {
-		                String responsePayload = null;
-		                try {
-		                        responsePayload = parseRawResponse(httpResponse);
-		                        this.rspEntity = responsePayload;
-
-		                }
-		                catch(Exception ee)
-		                {
-		                        Assert.fail(ee.getLocalizedMessage());
-		                }
-				validateMultipartResponse(responsePayload,executeNode);						
+		try {
+			httpResponse = sendPostRequestSync(executeNode);
+		}
+		catch (IOException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+
+		Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
+		String responseContentTypeValue = responseContentType.getValue();
+		if (responseContentTypeValue == null) {
+			throw new SkipException("Got empty response content type header.");
+		}
+
+		if (responseContentTypeValue.startsWith("multipart/related")) {
+			if (responseContentType.getValue().startsWith("multipart/related")) {
+				String responsePayload = null;
+				try {
+					responsePayload = parseRawResponse(httpResponse);
+					this.rspEntity = responsePayload;
+
+				}
+				catch (Exception ee) {
+					Assert.fail(ee.getLocalizedMessage());
+				}
+				validateMultipartResponse(responsePayload, executeNode);
 			}
 			else {
-				throw new SkipException("The value of the Content-Type header of the response is "+responseContentType.getValue()+ " but the response payload states Content-Type: multipart/related");						
+				throw new SkipException(
+						"The value of the Content-Type header of the response is " + responseContentType.getValue()
+								+ " but the response payload states Content-Type: multipart/related");
 			}
 		}
 		else {
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			try {
-	                        switch (statusCode) {
-	                        case 200:
-	                            validateResponse(httpResponse, executeValidator, data);
-	                            break;
-	                        case 201:                            
-	                            Header locationHeader = httpResponse.getFirstHeader("location");
-	                            String locationString = locationHeader.getValue();
-	                            httpResponse = sendGetRequest(locationString, "application/json");
-	                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	                            httpResponse.getEntity().writeTo(baos);
-	                            String responseContentString = baos.toString();
-	                            baos.close();
-	                            httpResponse.getEntity().getContent().close();
-	                            ObjectMapper objectMapper =new ObjectMapper();
-	                            JsonNode statusNode = objectMapper.readTree(responseContentString);
-	                            loopOverStatus(statusNode);
-	                            break;
-	                        default:
-	                            Assert.fail("Got unexpected status code: " + statusCode);
-	                            break;
-	                        }
-                        } catch (Exception e) {
-                            Assert.fail(e.getMessage());
-                        }
+				switch (statusCode) {
+				case 200:
+					validateResponse(httpResponse, executeValidator, data);
+					break;
+				case 201:
+					Header locationHeader = httpResponse.getFirstHeader("location");
+					String locationString = locationHeader.getValue();
+					httpResponse = sendGetRequest(locationString, "application/json");
+					ByteArrayOutputStream baos = new ByteArrayOutputStream();
+					httpResponse.getEntity().writeTo(baos);
+					String responseContentString = baos.toString();
+					baos.close();
+					httpResponse.getEntity().getContent().close();
+					ObjectMapper objectMapper = new ObjectMapper();
+					JsonNode statusNode = objectMapper.readTree(responseContentString);
+					loopOverStatus(statusNode);
+					break;
+				default:
+					Assert.fail("Got unexpected status code: " + statusCode);
+					break;
+				}
+			}
+			catch (Exception e) {
+				Assert.fail(e.getMessage());
+			}
 		}
 
-
 		executeNode = createExecuteJsonNodeWithWrongInput(echoProcessId);
 		data = new ValidationData<>();
 		try {
@@ -1191,53 +1230,65 @@ public void testJobCreationInputValidation() {
 			Body body = Body.from(responseNode);
 			responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
-			if(statusCode == 201) {
-                            Header locationHeader = httpResponse.getFirstHeader("location");
-                            String locationString = locationHeader.getValue();
-                            httpResponse = sendGetRequest(locationString, "application/json");
-                            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                            httpResponse.getEntity().writeTo(baos);
-                            String responseContentString = baos.toString();
-                            baos.close();
-                            httpResponse.getEntity().getContent().close();
-                            ObjectMapper objectMapper =new ObjectMapper();
-                            JsonNode statusNode = objectMapper.readTree(responseContentString);
-                            assertTrue(loopOverStatusReturnsFailed(statusNode));
-			} else {
-	                        Assert.assertTrue(statusCode==HttpStatus.SC_BAD_REQUEST || statusCode==HttpStatus.SC_INTERNAL_SERVER_ERROR, "Was expecting a Status Code of 400 or 500 but found "+statusCode+" (See Table 10 of OGC API - Processes - Part 1, OGC 18-062r2).");
-	                        Assert.assertTrue(responseContentType.getValue().equals("application/json") || responseContentType.getValue().startsWith("application/json;"), "Was expecting a Status Code of 400 or 500 but found "+statusCode+" (See Table 10 of OGC API - Processes - Part 1, OGC 18-062r2).");
-	                        assertTrue(validateResponseAgainstSchema(EXCEPTION_SCHEMA_URL,body.getContentAsNode(null, null, null).toString()),
-	                                    "Unable to validate the response document against: "+EXCEPTION_SCHEMA_URL);
-			}
-		} catch (Exception e) {
+			if (statusCode == 201) {
+				Header locationHeader = httpResponse.getFirstHeader("location");
+				String locationString = locationHeader.getValue();
+				httpResponse = sendGetRequest(locationString, "application/json");
+				ByteArrayOutputStream baos = new ByteArrayOutputStream();
+				httpResponse.getEntity().writeTo(baos);
+				String responseContentString = baos.toString();
+				baos.close();
+				httpResponse.getEntity().getContent().close();
+				ObjectMapper objectMapper = new ObjectMapper();
+				JsonNode statusNode = objectMapper.readTree(responseContentString);
+				assertTrue(loopOverStatusReturnsFailed(statusNode));
+			}
+			else {
+				Assert.assertTrue(
+						statusCode == HttpStatus.SC_BAD_REQUEST || statusCode == HttpStatus.SC_INTERNAL_SERVER_ERROR,
+						"Was expecting a Status Code of 400 or 500 but found " + statusCode
+								+ " (See Table 10 of OGC API - Processes - Part 1, OGC 18-062r2).");
+				Assert.assertTrue(
+						responseContentType.getValue().equals("application/json")
+								|| responseContentType.getValue().startsWith("application/json;"),
+						"Was expecting a Status Code of 400 or 500 but found " + statusCode
+								+ " (See Table 10 of OGC API - Processes - Part 1, OGC 18-062r2).");
+				assertTrue(
+						validateResponseAgainstSchema(EXCEPTION_SCHEMA_URL,
+								body.getContentAsNode(null, null, null).toString()),
+						"Unable to validate the response document against: " + EXCEPTION_SCHEMA_URL);
+			}
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 
 	}
 
-        private boolean checkForIssue54(ValidationData<Void> data) {
-            try {
-                // Validity of schemas needs to be checked by OAPIP SWG.
-                // See https://github.com/opengeospatial/ogcapi-processes/issues/350
-                // Validation results containing message "More than 1 schema is
-                // valid." will not be regarded as errors until
-                // ogcapi-processes/issues/350 is fixed/closed.
-                if (data.results() != null && data.results().items().size() > 0) {
-                    if (data.results().items().get(0).message().contains(ISSUE_54_MESSAGE_TEXT)) {
-                        return true;
-                    }
-                }
-            } catch (Exception e) {
-                return false;
-            }
-            return false;
-    }
+	private boolean checkForIssue54(ValidationData<Void> data) {
+		try {
+			// Validity of schemas needs to be checked by OAPIP SWG.
+			// See https://github.com/opengeospatial/ogcapi-processes/issues/350
+			// Validation results containing message "More than 1 schema is
+			// valid." will not be regarded as errors until
+			// ogcapi-processes/issues/350 is fixed/closed.
+			if (data.results() != null && data.results().items().size() > 0) {
+				if (data.results().items().get(0).message().contains(ISSUE_54_MESSAGE_TEXT)) {
+					return true;
+				}
+			}
+		}
+		catch (Exception e) {
+			return false;
+		}
+		return false;
+	}
 
-    private HttpResponse sendPostRequestSync(JsonNode executeNode, boolean checkForStatusCode) throws IOException {
+	private HttpResponse sendPostRequestSync(JsonNode executeNode, boolean checkForStatusCode) throws IOException {
 		HttpResponse httpResponse = clientBuilder.build().execute(createPostRequest(executeNode));
 		int statusCode = httpResponse.getStatusLine().getStatusCode();
-		if(checkForStatusCode) {
-		    Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
+		if (checkForStatusCode) {
+			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
 		}
 		return httpResponse;
 	}
@@ -1248,7 +1299,7 @@ private HttpResponse sendPostRequestSync(JsonNode executeNode) throws IOExceptio
 
 	private HttpPost createPostRequest(JsonNode executeNode) {
 		HttpPost request = new HttpPost(executeEndpoint);
-	    this.reqEntity = request;
+		this.reqEntity = request;
 		request.setHeader("Accept", "application/json");
 		ContentType contentType = ContentType.APPLICATION_JSON;
 		request.setEntity(new StringEntity(executeNode.toString(), contentType));
@@ -1257,26 +1308,26 @@ private HttpPost createPostRequest(JsonNode executeNode) {
 
 	private HttpResponse sendPostRequestASync(JsonNode executeNode) throws IOException {
 		HttpPost request = new HttpPost(executeEndpoint);
-	    this.reqEntity = request;
+		this.reqEntity = request;
 		request.setHeader("Accept", "application/json");
 		request.setHeader("Prefer", "respond-async");
 		ContentType contentType = ContentType.APPLICATION_JSON;
 		request.setEntity(new StringEntity(executeNode.toString(), contentType));
 		HttpResponse httpResponse = clientBuilder.build().execute(request);
 		int statusCode = httpResponse.getStatusLine().getStatusCode();
-		//https://github.com/opengeospatial/ets-ogcapi-processes10/issues/52
-		//Allow also 200 responses if process supports both sync and async execution
-		switch(supportedExecutionModes) {
-        case EITHER:
-            Assert.assertTrue(statusCode == 201 || statusCode == 200, "Got unexpected status code: " + statusCode);
-            break;
-        case ONLY_ASYNC:
-            Assert.assertTrue(statusCode == 201, "Got unexpected status code: " + statusCode);
-            break;
-        case ONLY_SYNC:
-            break;
-        default:
-            break;
+		// https://github.com/opengeospatial/ets-ogcapi-processes10/issues/52
+		// Allow also 200 responses if process supports both sync and async execution
+		switch (supportedExecutionModes) {
+		case EITHER:
+			Assert.assertTrue(statusCode == 201 || statusCode == 200, "Got unexpected status code: " + statusCode);
+			break;
+		case ONLY_ASYNC:
+			Assert.assertTrue(statusCode == 201, "Got unexpected status code: " + statusCode);
+			break;
+		case ONLY_SYNC:
+			break;
+		default:
+			break;
 		}
 		return httpResponse;
 	}
@@ -1285,16 +1336,17 @@ private JsonNode createExecuteJsonNodeWithWrongInput(String echoProcessId) throw
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		boolean foundTestableInput = false;
 		for (Input input : inputs) {
-			if(checkForFormat(input.getTypes()) != null) {
+			if (checkForFormat(input.getTypes()) != null) {
 				foundTestableInput = true;
 				addInputWithWrongFormat(input, inputsNode);
-			} else
-			    addInput(input, inputsNode);
+			}
+			else
+				addInput(input, inputsNode);
 		}
-		if(!foundTestableInput) {
+		if (!foundTestableInput) {
 			throw new SkipException("No input with specified format found, skipping test.");
 		}
 		for (Output output : outputs) {
@@ -1313,7 +1365,7 @@ private void addInputWithWrongFormat(Input input, ObjectNode inputsNode) {
 
 	private Type checkForFormat(List<Type> types) {
 		for (Type type : types) {
-			if(type.getContentMediaType() != null) {
+			if (type.getContentMediaType() != null) {
 				return type;
 			}
 		}
@@ -1321,29 +1373,30 @@ private Type checkForFormat(List<Type> types) {
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 20: /conf/core/job-creation-inputs
 	* Test Purpose: Validate that servers can accept input values both inline and by reference.
 	* Requirement: /req/core/job-creation-inputs
 	* Test Method:
-
+	
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-inputs ")
 	public void testJobCreationInputs() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		try {
-			HttpResponse httpResponse =sendPostRequestSync(executeNode);
+			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 16: /conf/core/job-creation-op
 	* Test Purpose: Validate the creation of a new job.
 	* Requirement: /req/core/job-creation-op
@@ -1352,22 +1405,21 @@ public void testJobCreationInputs() {
 	* /req/core/job-creation-default-execution-mode,
 	* req_core_job-creation-auto-execution-mode,/req/core/job-creation-auto-execution-mode
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-op ")
 	public void testJobCreationOp() {
-		
+
 		HttpResponse httpResponse = null;
-		
-		if(echoProcessSupportsAsync())
-		{			
-			//create async job
+
+		if (echoProcessSupportsAsync()) {
+			// create async job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
 				HttpClient client = HttpClientBuilder.create().build();
 				String executeEndpoint = rootUri + echoProcessPath + "/execution";
 				HttpPost request = new HttpPost(executeEndpoint);
-			    this.reqEntity = request;
+				this.reqEntity = request;
 				request.setHeader("Accept", "application/json");
 				request.setHeader("Prefer", "respond-async ");
 				ContentType contentType = ContentType.APPLICATION_JSON;
@@ -1387,28 +1439,31 @@ public void testJobCreationOp() {
 				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
 				Assert.assertTrue(data.isValid(), printResults(data.results()));
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-        }
-        else {
-			//create sync job
+		}
+		else {
+			// create sync job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
 				httpResponse = sendPostRequestSync(executeNode);
 				String responsePayload = parseRawResponse(httpResponse);
-				if(responsePayload.contains("Content-Type: multipart/related")){
+				if (responsePayload.contains("Content-Type: multipart/related")) {
 					Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-					if(responseContentType.getValue().startsWith("multipart/related")) {
-						validateMultipartResponse(responsePayload,executeNode);						
+					if (responseContentType.getValue().startsWith("multipart/related")) {
+						validateMultipartResponse(responsePayload, executeNode);
 					}
 					else {
-						throw new SkipException("The value of the Content-Type header of the response is "+responseContentType.getValue()+ " but the response payload states Content-Type: multipart/related");						
+						throw new SkipException("The value of the Content-Type header of the response is "
+								+ responseContentType.getValue()
+								+ " but the response payload states Content-Type: multipart/related");
 					}
 				}
 				else {
@@ -1416,70 +1471,71 @@ public void testJobCreationOp() {
 						JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
 						Body body = Body.from(responseNode);
 						Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-						Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-								.build();
+						Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode())
+								.body(body).header(CONTENT_TYPE, responseContentType.getValue()).build();
 						getStatusValidator.validateResponse(response, data);
-						Assert.assertTrue(data.isValid(), printResults(data.results()));				
-					} catch (IOException e) {
+						Assert.assertTrue(data.isValid(), printResults(data.results()));
+					}
+					catch (IOException e) {
 						Assert.fail(e.getLocalizedMessage());
 					}
 				}
 			}
-			catch(Exception ee)
-			{
+			catch (Exception ee) {
 				Assert.fail(ee.getLocalizedMessage());
 			}
-        	
-		}			
+
+		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 19: /conf/core/job-creation-request
 	* Test Purpose: Validate that the body of a job creation operation complies with the required structure and contents.
 	* Requirement: /req/core/job-creation-request
 	* Test Method:
-
+	
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-request ")
 	public void testJobCreationRequest() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		final ValidationData<Void> data = new ValidationData<>();
 		HttpResponse httpResponse = null;
 		String responsePayload = null;
 		try {
-			if(echoProcessSupportsAsync())
-			{			
+			if (echoProcessSupportsAsync()) {
 				httpResponse = sendPostRequestASync(executeNode);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
 				Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
 				Header locationHeader = httpResponse.getFirstHeader("location");
 				String locationString = locationHeader.getValue();
 				httpResponse = sendGetRequest(locationString, "application/json");
-			
+
 			}
 			else {
-				
+
 				httpResponse = sendPostRequestSync(executeNode);
-		
+
 			}
-			
+
 			responsePayload = parseRawResponse(httpResponse);
 
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
-		
-		
-		if(responsePayload.contains("Content-Type: multipart/related")){
+
+		if (responsePayload.contains("Content-Type: multipart/related")) {
 			Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-			if(responseContentType.getValue().startsWith("multipart/related")) {
-				validateMultipartResponse(responsePayload,executeNode);						
+			if (responseContentType.getValue().startsWith("multipart/related")) {
+				validateMultipartResponse(responsePayload, executeNode);
 			}
 			else {
-				throw new SkipException("The value of the Content-Type header of the response is "+responseContentType.getValue()+ " but the response payload states Content-Type: multipart/related");						
+				throw new SkipException(
+						"The value of the Content-Type header of the response is " + responseContentType.getValue()
+								+ " but the response payload states Content-Type: multipart/related");
 			}
 		}
 		else {
@@ -1487,19 +1543,20 @@ public void testJobCreationRequest() {
 				JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
-				Assert.assertTrue(data.isValid(), printResults(data.results()));				
-			} catch (IOException e) {
+				Assert.assertTrue(data.isValid(), printResults(data.results()));
+			}
+			catch (IOException e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
 		}
-		
+
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 34: /conf/core/job-creation-success-async
 	* Test Purpose: Validate the results of a job that has been created using the `async` execution mode.
 	* Requirement: /req/core/job-creation-success-async
@@ -1507,51 +1564,51 @@ public void testJobCreationRequest() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-success-async ")
 	public void testJobCreationSuccessAsync() {
-		if(echoProcessSupportsAsync())
-		{			
-			//create job
+		if (echoProcessSupportsAsync()) {
+			// create job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
 				HttpResponse httpResponse = sendPostRequestASync(executeNode);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
-				Assert.assertTrue(statusCode == 200 ||  statusCode == 201, "Got unexpected status code: " + statusCode);
+				Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
 				Header locationHeader = httpResponse.getFirstHeader("location");
 				String locationString = locationHeader.getValue();
 				httpResponse = sendGetRequest(locationString, "application/json");
 				validateResponse(httpResponse, getStatusValidator, data);
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-        }
-        else {
+		}
+		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		}		
+		}
 	}
 
-	private void validateResponse(HttpResponse httpResponse, OperationValidator validator, ValidationData<Void> data) throws IOException {
+	private void validateResponse(HttpResponse httpResponse, OperationValidator validator, ValidationData<Void> data)
+			throws IOException {
 		JsonNode responseNode = parseResponse(httpResponse);
 		Body body = Body.from(responseNode);
-	        //https://github.com/opengeospatial/ets-ogcapi-processes10/issues/14
-	        //Treat Content-Type application/problem+json as application/json for now
+		// https://github.com/opengeospatial/ets-ogcapi-processes10/issues/14
+		// Treat Content-Type application/problem+json as application/json for now
 		Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-                String responseContentTypeValue = responseContentType.getValue();
-                if(responseContentTypeValue.equals("application/problem+json")) {
-                    responseContentTypeValue = "application/json";
-                }
-                if(validator.getOperation().getOperationId().equals("execute") && httpResponse.getStatusLine().getStatusCode() == 200) {
-                    responseContentTypeValue = "/*";
-                }
-		Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentTypeValue)
-				.build();
+		String responseContentTypeValue = responseContentType.getValue();
+		if (responseContentTypeValue.equals("application/problem+json")) {
+			responseContentTypeValue = "application/json";
+		}
+		if (validator.getOperation().getOperationId().equals("execute")
+				&& httpResponse.getStatusLine().getStatusCode() == 200) {
+			responseContentTypeValue = "/*";
+		}
+		Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+				.header(CONTENT_TYPE, responseContentTypeValue).build();
 		validator.validateResponse(response, data);
 		Assert.assertTrue(data.isValid(), printResults(data.results()));
 	}
-	
-
 
 	private JsonNode parseResponse(HttpResponse httpResponse) throws IOException {
 		StringWriter writer = new StringWriter();
@@ -1570,13 +1627,13 @@ private String parseRawResponse(HttpResponse httpResponse) throws IOException {
 
 	private HttpResponse sendGetRequest(String url, String acceptType) throws IOException {
 		HttpGet request = new HttpGet(url);
-	    this.reqEntity = request;
-	    request.setHeader("Accept", acceptType);
+		this.reqEntity = request;
+		request.setHeader("Accept", acceptType);
 		return clientBuilder.build().execute(request);
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 33: /conf/core/job-creation-sync-document
 	* Test Purpose: Validate that the server responds as expected when synchronous execution is sc_execution_code,negotiated and the response type is `document`.
 	* Requirement: /req/core/job-creation-sync-document
@@ -1585,14 +1642,15 @@ private HttpResponse sendGetRequest(String url, String acceptType) throws IOExce
 	* 2.  Verify that each process executes successfully according to requirement req_core_job-creation-sync-document,/req/core/job-creation-sync-document
 	* |===
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-sync-document ")
 	public void testJobCreationSyncDocument() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId, RESPONSE_VALUE_DOCUMENT);
 		try {
 			sendPostRequestSync(executeNode, true);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
@@ -1604,7 +1662,7 @@ private JsonNode createExecuteJsonNode(String echoProcessId, String responseMode
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 32: /conf/core/job-creation-sync-raw-mixed-multi
 	* Test Purpose: Validate that the server responds as expected when synchronous execution is sc_execution_mode,negotiated, the response type is `raw` and the output transmission is a mix of `value` and `reference`.
 	* Requirement: /req/core/job-creation-sync-raw-mixed-multi
@@ -1618,20 +1676,21 @@ private JsonNode createExecuteJsonNode(String echoProcessId, String responseMode
 	*
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-sync-raw-mixed-multi ")
 	public void testJobCreationSyncRawMixedMulti() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId, RESPONSE_VALUE_RAW);
 		try {
-			 sendPostRequestSync(executeNode, true);
-		} catch (Exception e) {
+			sendPostRequestSync(executeNode, true);
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 31: /conf/core/job-creation-sync-raw-ref
 	* Test Purpose: Validate that the server responds as expected when synchronous execution is sc_execution_mode,negotiated, the response type is `raw` and the transmission mode is `ref`.
 	* Requirement: /req/core/job-creation-sync-raw-ref
@@ -1641,55 +1700,52 @@ public void testJobCreationSyncRawMixedMulti() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-sync-raw-ref ")
 	public void testJobCreationSyncRawRef() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId, RESPONSE_VALUE_RAW);
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode, true);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
-	
-	private void validateMultipartResponse(String responsePayload, JsonNode executeNode){
-		
+
+	private void validateMultipartResponse(String responsePayload, JsonNode executeNode) {
+
 		boolean foundTestString = false;
 		String errorMessage = "";
 		this.rspEntity = responsePayload;
-		
-     try {
-    	 
-    	 
-	    	 MimeMultipart mimeMultipart = new MimeMultipart(new ByteArrayDataSource(responsePayload.getBytes(),"multipart/related"));
-	    	 if(mimeMultipart.getCount()<1)
-	    	 {
-	    	 	Assert.assertTrue(mimeMultipart.getCount()>0,"Error with multipart response");
-	    	 }
-			for(int i=0; i < mimeMultipart.getCount(); i++)
-			{
-				if(mimeMultipart.getBodyPart(i).getContent().toString().contains(TEST_STRING_INPUT)) {
-				    foundTestString = true;
-				    break;
+
+		try {
+
+			MimeMultipart mimeMultipart = new MimeMultipart(
+					new ByteArrayDataSource(responsePayload.getBytes(), "multipart/related"));
+			if (mimeMultipart.getCount() < 1) {
+				Assert.assertTrue(mimeMultipart.getCount() > 0, "Error with multipart response");
+			}
+			for (int i = 0; i < mimeMultipart.getCount(); i++) {
+				if (mimeMultipart.getBodyPart(i).getContent().toString().contains(TEST_STRING_INPUT)) {
+					foundTestString = true;
+					break;
 				}
 			}
 
-	
-					   
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			errorMessage = e.getLocalizedMessage();
-		} 
-                if(!foundTestString) {
-                    errorMessage = "The input test string was not detected in one of the parts of the multipart response.";
-                }
-     
+		}
+		if (!foundTestString) {
+			errorMessage = "The input test string was not detected in one of the parts of the multipart response.";
+		}
 
-		Assert.assertTrue(foundTestString, "The multipart response failed the validity check because "+errorMessage);
-	}	
+		Assert.assertTrue(foundTestString, "The multipart response failed the validity check because " + errorMessage);
+	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 30: /conf/core/job-creation-sync-raw-value-multi
 	* Test Purpose: Validate that the server responds as expected when synchronous execution is sc_execution_mode,negotiated, the response type is `raw` and the output transmission is `value`.
 	* Requirement: /req/core/job-creation-sync-raw-value-multi
@@ -1699,20 +1755,21 @@ private void validateMultipartResponse(String responsePayload, JsonNode executeN
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-sync-raw-value-multi ")
 	public void testJobCreationSyncRawValueMulti() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId, RESPONSE_VALUE_RAW);
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode, true);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 28: /conf/core/job-creation-sync-raw-value-one
 	* Test Purpose: Validate that the server responds as expected when synchronous execution is sc_execution_mode,negotiated, a single output value is requested, the response type is `raw` and the output transmission is `value`.
 	* Requirement: /req/core/job-creation-sync-raw-value-one
@@ -1722,7 +1779,7 @@ public void testJobCreationSyncRawValueMulti() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-creation-sync-raw-value-one ")
 	public void testJobCreationSyncRawValueOne() {
 		// create job
@@ -1734,14 +1791,15 @@ public void testJobCreationSyncRawValueOne() {
 
 			Assert.assertTrue(parseRawResponse(httpResponse).contains(TEST_STRING_INPUT));
 
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 37: /conf/core/job-exception-no-such-job
 	* Test Purpose: Validate that an invalid job identifier is handled correctly.
 	* Requirement: /req/core/job-exception-no-such-job
@@ -1763,20 +1821,21 @@ public void testJobCreationSyncRawValueOne() {
 	*
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-exception-no-such-job ")
 	public void testJobExceptionNoSuchJob() {
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
 			HttpResponse httpResponse = sendGetRequest(getInvalidJobURL.toString(), "application/json");
 			validateResponse(httpResponse, getJobsValidator, data);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 35: /conf/core/job-op
 	* Test Purpose: Validate that the status info of a job can be retrieved.
 	* Requirement: /req/core/job
@@ -1785,29 +1844,30 @@ public void testJobExceptionNoSuchJob() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job ")
 	public void testJobOp() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		try {
 			HttpClient client = HttpClientBuilder.create().build();
 			String executeEndpoint = rootUri + echoProcessPath + "/execution";
 			HttpPost request = new HttpPost(executeEndpoint);
-		    this.reqEntity = request;
+			this.reqEntity = request;
 			request.setHeader("Accept", "application/json");
 			ContentType contentType = ContentType.APPLICATION_JSON;
 			request.setEntity(new StringEntity(executeNode.toString(), contentType));
 			HttpResponse httpResponse = client.execute(request);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test null: /conf/core/job-results-no-such-job
 	* Test Purpose: Validate that the job results retrieved using an invalid job identifier complies with the require structure and contents.
 	* Requirement: /req/core/job-results-exception-no-such-job
@@ -1828,20 +1888,21 @@ public void testJobOp() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-exception-no-such-job ")
 	public void testJobResultsNoSuchJob() {
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
 			HttpResponse httpResponse = sendGetRequest(getInvalidJobResultURL.toString(), "application/json");
 			validateResponse(httpResponse, getResultValidator, data);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 46: /conf/core/job-results-exception-results-not-ready
 	* Test Purpose: Validate that the job results retrieved for an incomplete job complies with the require structure and contents.
 	* Requirement: /req/core/job-results-exception-results-not-ready
@@ -1863,90 +1924,107 @@ public void testJobResultsNoSuchJob() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-exception-results-not-ready ")
 	public void testJobResultsExceptionResultsNotReady() {
-		if(echoProcessSupportsAsync())
-		{
+		if (echoProcessSupportsAsync()) {
 			JsonNode statusNode = null;
 			HttpResponse httpResponse = null;
 			final ValidationData<Void> data = new ValidationData<>();
-			//create invalid execute request
+			// create invalid execute request
 			JsonNode executeNode;
-            try {
-                executeNode = createExecuteJsonNodeWithPauseInput(echoProcessId, RESPONSE_VALUE_RAW);
-            } catch (SkipException e) {
-                throw e;
-            }
-			
 			try {
-				System.out.println("Checking error: asynchronous POST request..."+executeNode);
+				executeNode = createExecuteJsonNodeWithPauseInput(echoProcessId, RESPONSE_VALUE_RAW);
+			}
+			catch (SkipException e) {
+				throw e;
+			}
+
+			try {
+				System.out.println("Checking error: asynchronous POST request..." + executeNode);
 				httpResponse = sendPostRequestASync(executeNode);
-				
+
 				ByteArrayOutputStream baos1 = new ByteArrayOutputStream();
 				httpResponse.getEntity().writeTo(baos1);
-				
-				String responseContentString1 = baos1.toString();	
+
+				String responseContentString1 = baos1.toString();
 				baos1.close();
 				System.out.println("HTTP Response Content: " + responseContentString1);
 				httpResponse.getEntity().getContent().close();
-				
+
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
-				Header locationHeader = httpResponse.getFirstHeader("location");	//location of job			
-				String jobLocationString = locationHeader.getValue();			
+				Header locationHeader = httpResponse.getFirstHeader("location"); // location
+																					// of
+																					// job
+				String jobLocationString = locationHeader.getValue();
 				System.out.println("Job location: " + jobLocationString);
-				
+
 				System.out.println("Checking error: Sending GET request to job location...");
-				httpResponse = sendGetRequest(jobLocationString, "application/json");	//Issue an HTTP GET request to the URL ‘/jobs/{jobID}/results’ before the job completes execution.
-				
-				
+				httpResponse = sendGetRequest(jobLocationString, "application/json"); // Issue
+																						// an
+																						// HTTP
+																						// GET
+																						// request
+																						// to
+																						// the
+																						// URL
+																						// ‘/jobs/{jobID}/results’
+																						// before
+																						// the
+																						// job
+																						// completes
+																						// execution.
+
 				String jobResultsLocationString = jobLocationString + "/results";
 				System.out.println("Checking error: Job results location: " + jobResultsLocationString);
 				httpResponse = sendGetRequest(jobResultsLocationString, "application/json");
-				Assert.assertEquals(httpResponse.getStatusLine().getStatusCode(), 404,"Failed Abstract test A.46 (Step 3). The response to the /jobs/{jobID}/results request did not return a 404 status code.");
-				
-				
+				Assert.assertEquals(httpResponse.getStatusLine().getStatusCode(), 404,
+						"Failed Abstract test A.46 (Step 3). The response to the /jobs/{jobID}/results request did not return a 404 status code.");
+
 				ByteArrayOutputStream baos = new ByteArrayOutputStream();
 				httpResponse.getEntity().writeTo(baos);
-				
-				String responseContentString = baos.toString();	
+
+				String responseContentString = baos.toString();
 				baos.close();
 				System.out.println("HTTP Response Content: " + responseContentString);
 				httpResponse.getEntity().getContent().close();
-				ObjectMapper objectMapper =new ObjectMapper();
-			    JsonNode resultsNode = objectMapper.readTree(responseContentString);
+				ObjectMapper objectMapper = new ObjectMapper();
+				JsonNode resultsNode = objectMapper.readTree(responseContentString);
 				JsonNode typeNode = resultsNode.get("type");
 				if (typeNode != null) {
 					String typeValue = typeNode.textValue();
 					System.out.println("Actual Type Value: " + typeValue);
 				}
-				
-			    
-			    Assert.assertTrue(resultsNode.get("type").textValue().equals("http://www.opengis.net/def/exceptions/ogcapi-processes-1/1.0/result-not-ready"),
-			    		"Failed Abstract test A.46 (Step 4). The document did not contain an exception of type http://www.opengis.net/def/exceptions/ogcapi-processes-1/1.0/result-not-ready");
-			    
-			    Assert.assertTrue(validateResponseAgainstSchema(EXCEPTION_SCHEMA_URL,responseContentString),
-					    "Failed Abstract test A.46 (Step 5). Unable to validate the response document against: "+EXCEPTION_SCHEMA_URL);	
-				
+
+				Assert.assertTrue(
+						resultsNode.get("type").textValue().equals(
+								"http://www.opengis.net/def/exceptions/ogcapi-processes-1/1.0/result-not-ready"),
+						"Failed Abstract test A.46 (Step 4). The document did not contain an exception of type http://www.opengis.net/def/exceptions/ogcapi-processes-1/1.0/result-not-ready");
+
+				Assert.assertTrue(validateResponseAgainstSchema(EXCEPTION_SCHEMA_URL, responseContentString),
+						"Failed Abstract test A.46 (Step 5). Unable to validate the response document against: "
+								+ EXCEPTION_SCHEMA_URL);
+
 				boolean isSchemaValid = validateResponseAgainstSchema(EXCEPTION_SCHEMA_URL, responseContentString);
 				System.out.println("Schema Validation Result: " + isSchemaValid);
 
-			    
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				System.out.println("Checking error: An exception occurred: " + e.getMessage());
 				e.printStackTrace();
 				Assert.fail(e.getLocalizedMessage());
 			}
-		
-        }
-        else {
-			throw new SkipException("This test is skipped because the server has not declared support for asynchronous execution mode.");
-		}  
+
+		}
+		else {
+			throw new SkipException(
+					"This test is skipped because the server has not declared support for asynchronous execution mode.");
+		}
 
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 47: /conf/core/job-results-failed
 	* Test Purpose: Validate that the job results for a failed job complies with the require structure and contents.
 	* Requirement: /req/core/job-results-failed
@@ -1969,18 +2047,19 @@ public void testJobResultsExceptionResultsNotReady() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-failed ")
 	public void testJobResultsFailed() {
 		final ValidationData<Void> data = new ValidationData<>();
-		//create invalid execute request
+		// create invalid execute request
 		JsonNode executeNode = createInvalidExecuteJsonNode(echoProcessId);
 		try {
 			HttpResponse httpResponse = sendPostRequestSync(executeNode);
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			Assert.assertTrue(statusCode > 200, "Got unexpected status code: " + statusCode);
 			validateResponse(httpResponse, executeValidator, data);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
@@ -1988,12 +2067,12 @@ public void testJobResultsFailed() {
 	private JsonNode createInvalidExecuteJsonNode(String echoProcessId) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		executeNode.set("invalid-execute-request", new TextNode("true)"));
-//		executeNode.set("invalid-execute-request", objectMapper.);
+		// executeNode.set("invalid-execute-request", objectMapper.);
 		return executeNode;
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 38: /conf/core/job-results
 	* Test Purpose: Validate that the results of a job can be retrieved.
 	* Requirement: /req/core/job-results
@@ -2003,15 +2082,14 @@ private JsonNode createInvalidExecuteJsonNode(String echoProcessId) {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results ")
 	public void testJobResults() {
 		System.out.println("Entering testJobResults()");
 		HttpResponse httpResponse = null;
-		
-		if(echoProcessSupportsAsync())
-		{	
-			//create async job
+
+		if (echoProcessSupportsAsync()) {
+			// create async job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2021,23 +2099,24 @@ public void testJobResults() {
 				Header locationHeader = httpResponse.getFirstHeader("location");
 				String locationString = locationHeader.getValue();
 				httpResponse = sendGetRequest(locationString, "application/json");
-				assertTrue(httpResponse.getStatusLine().getStatusCode()==200,
-					    "Expected status code 200 but found "+httpResponse.getStatusLine().getStatusCode());
-	
+				assertTrue(httpResponse.getStatusLine().getStatusCode() == 200,
+						"Expected status code 200 but found " + httpResponse.getStatusLine().getStatusCode());
+
 				ByteArrayOutputStream baos = new ByteArrayOutputStream();
 				httpResponse.getEntity().writeTo(baos);
 				String responseContentString = baos.toString();
 				baos.close();
 				httpResponse.getEntity().getContent().close();
-				assertTrue(validateResponseAgainstSchema(STATUS_SCHEMA_URL,responseContentString),
-					    "Unable to validate the response document against: "+STATUS_SCHEMA_URL);
-	
-			} catch (Exception e) {
+				assertTrue(validateResponseAgainstSchema(STATUS_SCHEMA_URL, responseContentString),
+						"Unable to validate the response document against: " + STATUS_SCHEMA_URL);
+
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-        }
-        else {
-			//create sync job
+		}
+		else {
+			// create sync job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2045,13 +2124,12 @@ public void testJobResults() {
 				httpResponse = sendPostRequestSync(executeNode);
 				System.out.println("Received POST response: " + httpResponse);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
-				Assert.assertTrue(statusCode == 200, "Got unexpected status code: " + statusCode);	
+				Assert.assertTrue(statusCode == 200, "Got unexpected status code: " + statusCode);
 			}
-			catch(Exception ee)
-			{
+			catch (Exception ee) {
 				Assert.fail(ee.getLocalizedMessage());
 			}
-		} 		
+		}
 	}
 
 	private HttpResponse getResultResponse(HttpResponse httpResponse) throws IOException {
@@ -2060,11 +2138,11 @@ private HttpResponse getResultResponse(HttpResponse httpResponse) throws IOExcep
 		JsonNode linksNode = statusNode.get("links");
 		Assert.assertNotNull(linksNode);
 		Assert.assertTrue(!linksNode.isMissingNode(), "No links in status document.");
-		if(linksNode instanceof ArrayNode) {
-			ArrayNode linksArrayNode = (ArrayNode)linksNode;
+		if (linksNode instanceof ArrayNode) {
+			ArrayNode linksArrayNode = (ArrayNode) linksNode;
 			for (int i = 0; i < linksArrayNode.size(); i++) {
 				JsonNode linksChildNode = linksArrayNode.get(i);
-				if(linksChildNode.get("rel").asText().equals("http://www.opengis.net/def/rel/ogc/1.0/results")) {
+				if (linksChildNode.get("rel").asText().equals("http://www.opengis.net/def/rel/ogc/1.0/results")) {
 					String resultsUrl = linksChildNode.get("href").asText();
 					String resultsMimeType = linksChildNode.get("type").asText();
 					return sendGetRequest(resultsUrl, resultsMimeType);
@@ -2075,7 +2153,7 @@ private HttpResponse getResultResponse(HttpResponse httpResponse) throws IOExcep
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 44: /conf/core/job-results-async-document
 	* Test Purpose: Validate that the server responds as expected when the asynchronous execution is sc_execution_mode,negotiated and the response type is `document`.
 	* Requirement: /req/core/job-results-async-document
@@ -2096,28 +2174,28 @@ private HttpResponse getResultResponse(HttpResponse httpResponse) throws IOExcep
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-async-document ")
 	public void testJobResultsAsyncDocument() {
-		//create job
-		if(echoProcessSupportsAsync())
-		{		
+		// create job
+		if (echoProcessSupportsAsync()) {
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId, RESPONSE_VALUE_DOCUMENT);
 			try {
 				HttpResponse httpResponse = sendPostRequestASync(executeNode);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
 				Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
 		}
 		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		}		
+		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 43: /conf/core/job-results-async-raw-mixed-multi
 	* Test Purpose: Validate that the server responds as expected when asynchronous execution is sc_execution_mode,negotiated, more than one output is requested, the response type is `raw` and the output transmission is a mix of `value` and `reference`.
 	* Requirement: /req/core/job-results-async-raw-mixed-multi
@@ -2140,12 +2218,11 @@ public void testJobResultsAsyncDocument() {
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-async-raw-mixed-multi ")
 	public void testJobResultsAsyncRawMixedMulti() {
-		if(echoProcessSupportsAsync())
-		{		
-			//create job
+		if (echoProcessSupportsAsync()) {
+			// create job
 			JsonNode executeNode = createExecuteJsonNodeRawMixedMulti(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2158,21 +2235,22 @@ public void testJobResultsAsyncRawMixedMulti() {
 				JsonNode responseNode = parseResponse(httpResponse);
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
 				Assert.assertTrue(data.isValid(), printResults(data.results()));
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
 		}
 		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		}			
+		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 42: /conf/core/job-results-async-raw-ref
 	* Test Purpose: Validate that the server responds as expected when asynchronous execution is ,sc_execution_mode,negotiated, the response type is `raw` and the output transmission is `reference`.
 	* Requirement: /req/core/job-results-async-raw-ref
@@ -2193,12 +2271,11 @@ public void testJobResultsAsyncRawMixedMulti() {
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-async-raw-ref ")
 	public void testJobResultsAsyncRawRef() {
-		if(echoProcessSupportsAsync())
-		{			
-			//create job
+		if (echoProcessSupportsAsync()) {
+			// create job
 			JsonNode executeNode = createExecuteJsonNodeRawRef(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2211,21 +2288,22 @@ public void testJobResultsAsyncRawRef() {
 				JsonNode responseNode = parseResponse(httpResponse);
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
 				Assert.assertTrue(data.isValid(), printResults(data.results()));
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-        }
-        else {
+		}
+		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		} 		
+		}
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 41: /conf/core/job-results-async-raw-value-multi
 	* Test Purpose: Validate that the server responds as expected when asynchronous execution is sc_execution_mode,negotiated, more than one output is requested, the response type is `raw` and the output transmission is `value`.
 	* Requirement: /req/core/job-results-async-raw-value-multi
@@ -2246,12 +2324,11 @@ public void testJobResultsAsyncRawRef() {
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-async-raw-value-multi ")
 	public void testJobResultsAsyncRawValueMulti() {
-		if(echoProcessSupportsAsync())
-		{				
-			//create job
+		if (echoProcessSupportsAsync()) {
+			// create job
 			JsonNode executeNode = createExecuteJsonNodeRawValueMulti(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2264,120 +2341,126 @@ public void testJobResultsAsyncRawValueMulti() {
 				JsonNode responseNode = parseResponse(httpResponse);
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
 				Assert.assertTrue(data.isValid(), printResults(data.results()));
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-	    }
-	    else {
+		}
+		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		} 		
-	}
-
-	    private boolean loopOverStatusReturnsFailed(JsonNode responseNode){
-	        try{
-	                
-	            HttpClient client = HttpClientBuilder.create().build();
-	            ArrayNode linksArrayNode = (ArrayNode) responseNode.get("links");
-	            
-	            boolean hasMonitorOrResultLink=false;
-	            
-	            JsonNode statusNode = responseNode.get("status");
-	            
-	            if(statusNode != null) {
-	                String statusNodeText = statusNode.asText();
-	                if(statusNodeText.equals("failed")) {
-	                    return true;
-	                } else if(statusNodeText.equals("successful")) {
-	                    return false;
-	                }
-	            }
-
-	            if(!hasMonitorOrResultLink)
-	                for (JsonNode currentJsonNode : linksArrayNode) {
-	                
-	                    // Fetch status document
-	                    if(currentJsonNode.get("rel").asText()=="monitor"){
-	                        HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
-	                        request.setHeader("Accept", "application/json");
-	                        HttpResponse httpResponse = client.execute(request);
-	                        JsonNode resultNode = parseResponse(httpResponse);
-	                        loopOverStatus(resultNode);
-	                        hasMonitorOrResultLink=true;
-	                    }
-	                }
-	         
-	        }
-	        catch (Exception e) {
-	            Assert.fail(e.getLocalizedMessage());
-	        }
-	        return false;
-	    }
-
-    private void loopOverStatus(JsonNode responseNode){
-	try{
-            
-	    if(attempts >= MAX_ATTEMPTS) {
-	        throw new Exception(String.format("Server did not return result in %d seconds.", MAX_ATTEMPTS * ASYNC_LOOP_WAITING_PERIOD / 1000));
-	    }
-	    
-	    HttpClient client = HttpClientBuilder.create().build();
-	    ArrayNode linksArrayNode = (ArrayNode) responseNode.get("links");
-	  
-	    boolean hasMonitorOrResultLink=false;
-	    for (JsonNode currentJsonNode : linksArrayNode) {
-		// Fetch result document
-	        if(currentJsonNode.get("rel").asText().equals("http://www.opengis.net/def/rel/ogc/1.0/results")){
-	
-		    HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
-		
-		    HttpResponse httpResponse = client.execute(request);
-		
-		    String resultString = parseRawResponse(httpResponse);
-                    this.rspEntity = responseNode.asText();
-		 
-		    // May be more generic here
-		    Assert.assertTrue(resultString.contains(TEST_STRING_INPUT), "Response does not contain " + TEST_STRING_INPUT + "\n" + resultString);
-		    hasMonitorOrResultLink=true;
 		}
-	
-	    }
-
-	    if(!hasMonitorOrResultLink)
-		for (JsonNode currentJsonNode : linksArrayNode) {
-	            String relString = currentJsonNode.get("rel").asText();
-		
-		    // Fetch status document
-		    if(relString.equals("monitor") || relString.equals("status")){
-			HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
-			request.setHeader("Accept", "application/json");
-			HttpResponse httpResponse = client.execute(request);
-			JsonNode resultNode = parseResponse(httpResponse);
-			try {
-                            Thread.sleep(ASYNC_LOOP_WAITING_PERIOD);
-                        } catch (Exception e) {
-                            TestSuiteLogger.log(Level.WARNING, e.getMessage());
-                        }
-			attempts++;
-			loopOverStatus(resultNode);
-			hasMonitorOrResultLink=true;
-		    }
+	}
+
+	private boolean loopOverStatusReturnsFailed(JsonNode responseNode) {
+		try {
+
+			HttpClient client = HttpClientBuilder.create().build();
+			ArrayNode linksArrayNode = (ArrayNode) responseNode.get("links");
+
+			boolean hasMonitorOrResultLink = false;
+
+			JsonNode statusNode = responseNode.get("status");
+
+			if (statusNode != null) {
+				String statusNodeText = statusNode.asText();
+				if (statusNodeText.equals("failed")) {
+					return true;
+				}
+				else if (statusNodeText.equals("successful")) {
+					return false;
+				}
+			}
+
+			if (!hasMonitorOrResultLink)
+				for (JsonNode currentJsonNode : linksArrayNode) {
+
+					// Fetch status document
+					if (currentJsonNode.get("rel").asText() == "monitor") {
+						HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
+						request.setHeader("Accept", "application/json");
+						HttpResponse httpResponse = client.execute(request);
+						JsonNode resultNode = parseResponse(httpResponse);
+						loopOverStatus(resultNode);
+						hasMonitorOrResultLink = true;
+					}
+				}
+
 		}
-	        // if the code gets to this position, no result or monitor link were found
-	        // imho we need to throw an exception
-	        throw new AssertionError("No result (rel='http://www.opengis.net/def/rel/ogc/1.0/results') or monitor (rel='monitor') links were found in response.");
-	 
+		catch (Exception e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+		return false;
 	}
-	catch (Exception e) {
-	    Assert.fail(e.getLocalizedMessage());
+
+	private void loopOverStatus(JsonNode responseNode) {
+		try {
+
+			if (attempts >= MAX_ATTEMPTS) {
+				throw new Exception(String.format("Server did not return result in %d seconds.",
+						MAX_ATTEMPTS * ASYNC_LOOP_WAITING_PERIOD / 1000));
+			}
+
+			HttpClient client = HttpClientBuilder.create().build();
+			ArrayNode linksArrayNode = (ArrayNode) responseNode.get("links");
+
+			boolean hasMonitorOrResultLink = false;
+			for (JsonNode currentJsonNode : linksArrayNode) {
+				// Fetch result document
+				if (currentJsonNode.get("rel").asText().equals("http://www.opengis.net/def/rel/ogc/1.0/results")) {
+
+					HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
+
+					HttpResponse httpResponse = client.execute(request);
+
+					String resultString = parseRawResponse(httpResponse);
+					this.rspEntity = responseNode.asText();
+
+					// May be more generic here
+					Assert.assertTrue(resultString.contains(TEST_STRING_INPUT),
+							"Response does not contain " + TEST_STRING_INPUT + "\n" + resultString);
+					hasMonitorOrResultLink = true;
+				}
+
+			}
+
+			if (!hasMonitorOrResultLink)
+				for (JsonNode currentJsonNode : linksArrayNode) {
+					String relString = currentJsonNode.get("rel").asText();
+
+					// Fetch status document
+					if (relString.equals("monitor") || relString.equals("status")) {
+						HttpUriRequest request = new HttpGet(currentJsonNode.get("href").asText());
+						request.setHeader("Accept", "application/json");
+						HttpResponse httpResponse = client.execute(request);
+						JsonNode resultNode = parseResponse(httpResponse);
+						try {
+							Thread.sleep(ASYNC_LOOP_WAITING_PERIOD);
+						}
+						catch (Exception e) {
+							TestSuiteLogger.log(Level.WARNING, e.getMessage());
+						}
+						attempts++;
+						loopOverStatus(resultNode);
+						hasMonitorOrResultLink = true;
+					}
+				}
+			// if the code gets to this position, no result or monitor link were found
+			// imho we need to throw an exception
+			throw new AssertionError(
+					"No result (rel='http://www.opengis.net/def/rel/ogc/1.0/results') or monitor (rel='monitor') links were found in response.");
+
+		}
+		catch (Exception e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
 	}
-    }
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 40: /conf/core/job-results-async-raw-value-one
 	* Test Purpose: Validate that the server responds as expected when asynchronous execution is sc_execution_mode,negotiated, one output is requested, the response type is `raw` and the output transmission is `value`.
 	* Requirement: /req/core/job-results-async-raw-value-one
@@ -2398,65 +2481,64 @@ private void loopOverStatus(JsonNode responseNode){
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-async-raw-value-one ")
 	public void testJobResultsAsyncRawValueOne() {
-		if(echoProcessSupportsAsync())
-		{			
+		if (echoProcessSupportsAsync()) {
 			// create job
 			JsonNode executeNode = createExecuteJsonNodeOneOutput(echoProcessId, RESPONSE_VALUE_RAW);
 			try {
-				
+
 				HttpResponse httpResponse = sendPostRequestASync(executeNode);
 				int statusCode = httpResponse.getStatusLine().getStatusCode();
 				System.out.println("Status Code: " + statusCode);
 				Assert.assertTrue(statusCode == 200 || statusCode == 201, "Got unexpected status code: " + statusCode);
 				JsonNode responseNode = parseResponse(httpResponse);
-				if(statusCode == 200){
-				    Assert.assertEquals(responseNode.asText(), TEST_STRING_INPUT);
-				}else{
-					
-					Header locationHeader = httpResponse.getFirstHeader("location");				
-					String locationString = locationHeader.getValue();			
+				if (statusCode == 200) {
+					Assert.assertEquals(responseNode.asText(), TEST_STRING_INPUT);
+				}
+				else {
+
+					Header locationHeader = httpResponse.getFirstHeader("location");
+					String locationString = locationHeader.getValue();
 					System.out.println("Location String: " + locationString);
-					httpResponse = sendGetRequest(locationString, "application/json");	
+					httpResponse = sendGetRequest(locationString, "application/json");
 					ByteArrayOutputStream baos = new ByteArrayOutputStream();
 					httpResponse.getEntity().writeTo(baos);
-					String responseContentString = baos.toString();	
+					String responseContentString = baos.toString();
 					baos.close();
 					httpResponse.getEntity().getContent().close();
-				
-				
-					ObjectMapper objectMapper =new ObjectMapper();
-				    JsonNode statusNode = objectMapper.readTree(responseContentString);
-				    System.out.println("Status Node: " + statusNode);
-				 			
-					
-				    loopOverStatus(statusNode);
+
+					ObjectMapper objectMapper = new ObjectMapper();
+					JsonNode statusNode = objectMapper.readTree(responseContentString);
+					System.out.println("Status Node: " + statusNode);
+
+					loopOverStatus(statusNode);
 				}
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
-	    }
-	    else {
+		}
+		else {
 			throw new SkipException(ASYNC_MODE_NOT_SUPPORTED_MESSAGE);
-		} 		
+		}
 	}
 
 	private JsonNode createExecuteJsonNodeOneOutput(String echoProcessId, String responseValue) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		Input inputOne = inputs.get(0);
 		String inputId = inputOne.getId();
-                for (Input input : inputs) {
-                    addInput(input, inputsNode);
-                }
+		for (Input input : inputs) {
+			addInput(input, inputsNode);
+		}
 		for (Output output : outputs) {
-			if(output.getId().equals(inputId)) {
-			    addOutput(output, outputsNode);
-			    break;
+			if (output.getId().equals(inputId)) {
+				addOutput(output, outputsNode);
+				break;
 			}
 		}
 		executeNode.set("inputs", inputsNode);
@@ -2464,36 +2546,37 @@ private JsonNode createExecuteJsonNodeOneOutput(String echoProcessId, String res
 		executeNode.set(RESPONSE_KEY, new TextNode(responseValue));
 		return executeNode;
 	}
-	
+
 	private JsonNode createExecuteJsonNodeWithPauseInput(String echoProcessId, String responseValue) {
 		ObjectNode executeNode = objectMapper.createObjectNode();
 		ObjectNode inputsNode = objectMapper.createObjectNode();
 		ObjectNode outputsNode = objectMapper.createObjectNode();
-		//executeNode.set("id", new TextNode(echoProcessId));
+		// executeNode.set("id", new TextNode(echoProcessId));
 		Input inputOne = inputs.get(0);
 		String inputId = inputOne.getId();
 		addInput(inputOne, inputsNode);
 		for (Output output : outputs) {
-			if(output.getId().equals(inputId)) {
-			    addOutput(output, outputsNode);
-			    break;
+			if (output.getId().equals(inputId)) {
+				addOutput(output, outputsNode);
+				break;
 			}
 		}
-		
-		if(inputs.stream().anyMatch(p -> p.getId().equals("pause") )) {	                
-	                inputsNode.set("pause", new IntNode(5));		    
-		} else  {
-		    throw new SkipException("No input with id pause found.");
+
+		if (inputs.stream().anyMatch(p -> p.getId().equals("pause"))) {
+			inputsNode.set("pause", new IntNode(5));
+		}
+		else {
+			throw new SkipException("No input with id pause found.");
 		}
-		
+
 		executeNode.set("inputs", inputsNode);
 		executeNode.set("outputs", outputsNode);
 		executeNode.set(RESPONSE_KEY, new TextNode(responseValue));
 		return executeNode;
-	}	
+	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 39: /conf/core/job-results-sync
 	* Test Purpose: Validate that the server responds as expected when getting results from a job for a process that has been executed synchronously.
 	* Requirement: /req/core/job-results-sync
@@ -2504,54 +2587,49 @@ private JsonNode createExecuteJsonNodeWithPauseInput(String echoProcessId, Strin
 	* |====
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-results-sync ")
 	public void testJobResultsSync() {
-		//create job
+		// create job
 		JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-			
 
-		
 			HttpResponse httpResponse = sendPostRequestSync(executeNode, true);
-			Header[] headers = httpResponse.getHeaders("Link");			
-			
-			if(headers.length>0) {
+			Header[] headers = httpResponse.getHeaders("Link");
+
+			if (headers.length > 0) {
 				boolean foundRelMonitorHeader = false;
 				String statusUrl = "";
 				for (Header header : headers) {
 					String headerValue = header.getValue();
-			
+
 					if (headerValue.contains("rel=monitor")) {
 						foundRelMonitorHeader = true;
 						statusUrl = headerValue.split(";")[0];
 						break;
 					}
 				}
-				
-				if(!foundRelMonitorHeader) Assert.assertTrue(foundRelMonitorHeader,"Permission 7 and Requirement 33 of OGC 18-062r2 state that for servers that support the creation of a job for synchronously executed processes, a successful execution of the operation SHALL include an HTTP Link header with rel=monitor pointing to the created job.");
-				
+
+				if (!foundRelMonitorHeader)
+					Assert.assertTrue(foundRelMonitorHeader,
+							"Permission 7 and Requirement 33 of OGC 18-062r2 state that for servers that support the creation of a job for synchronously executed processes, a successful execution of the operation SHALL include an HTTP Link header with rel=monitor pointing to the created job.");
+
 				httpResponse = sendGetRequest(statusUrl, ContentType.APPLICATION_JSON.getMimeType());
 				validateResponse(httpResponse, getStatusValidator, data);
-	
-				
+
 			}
-	
-			
 
-		} catch (IOException e) {
-	
+		}
+		catch (IOException e) {
+
 			Assert.fail(e.getLocalizedMessage());
 		}
-		
-		
-		
-		
+
 	}
 
 	/**
-	* <pre>
+	 * <pre>
 	* Abstract Test 36: /conf/core/job-success
 	* Test Purpose: Validate that the job status info complies with the require structure and contents.
 	* Requirement: /req/core/job-success
@@ -2570,13 +2648,12 @@ public void testJobResultsSync() {
 	* |===
 	* TODO: Check additional content
 	* </pre>
-	*/
+	 */
 	@Test(description = "Implements Requirement /req/core/job-success ")
 	public void testJobSuccess() {
-		
-		if(echoProcessSupportsAsync())
-		{			
-			//create async job
+
+		if (echoProcessSupportsAsync()) {
+			// create async job
 			JsonNode executeNode = createExecuteJsonNode(echoProcessId);
 			final ValidationData<Void> data = new ValidationData<>();
 			try {
@@ -2602,16 +2679,19 @@ public void testJobSuccess() {
 				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
 				Body body = Body.from(responseNode);
 				Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentType.getValue())
-						.build();
+				Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+						.header(CONTENT_TYPE, responseContentType.getValue()).build();
 				getStatusValidator.validateResponse(response, data);
 				Assert.assertTrue(data.isValid(), printResults(data.results()));
-			} catch (Exception e) {
+			}
+			catch (Exception e) {
 				Assert.fail(e.getLocalizedMessage());
 			}
 		}
 		else {
-			throw new SkipException(Jobs.ASYNC_MODE_NOT_SUPPORTED_MESSAGE+" Also note that the specification does not mandate that servers create a job as a result of executing a process synchronously (See Clause 7.11.4 of OGC 18-062r2)");
+			throw new SkipException(Jobs.ASYNC_MODE_NOT_SUPPORTED_MESSAGE
+					+ " Also note that the specification does not mandate that servers create a job as a result of executing a process synchronously (See Clause 7.11.4 of OGC 18-062r2)");
 		}
 	}
+
 }
\ No newline at end of file
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/landingpage/LandingPage.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/landingpage/LandingPage.java
index 6117880..7e1295c 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/landingpage/LandingPage.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/landingpage/LandingPage.java
@@ -38,110 +38,137 @@
  */
 public class LandingPage extends CommonFixture {
 
-    private JsonPath response;
-    private String body;
-    
-    //private static String utrlSchema="http://schemas.opengis.net/ogcapi/common/part1/0.1/core/openapi/schemas/landingPage.json";
-    //private static String urlSchema="https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/core/openapi/schemas/landingPage.yaml";
-    private static String urlSchema="http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/landingPage.yaml";
-
-    /**
-     * <pre>
-     * cf. <a href="https://github.com/opengeospatial/ogcapi-processes/blob/master/core/abstract_tests/core/ATS_landingpage-op.adoc">core/abstract_tests/core/ATS_landingpage-op.adoc</a>
-     * Abstract Test 1: /conf/core/landingpage-op
-     * Test Purpose: Validate that a landing page can be retrieved from the expected location.
-     * Requirement: /req/core/root-op
-     *
-     * Test Method:
-     *  1. Issue an HTTP GET request to the URL {root}/
-     *  2. Validate that a document was returned with a status code 200
-     *  3. Validate the contents of the returned document using test /conf/core/landingpage-success.
-     * </pre>
-     */
-    @Test(description = "Implements Abstract Test 1: /conf/core/landingpage-op", groups = "A.2.1. Landing Page /")
-    public void testLandingPageRetrieval() {
-        Response request = init().baseUri( rootUri.toString() ).accept( JSON ).when().request( GET, "/" );
-        TestSuiteLogger.log(Level.INFO, rootUri.toString());
-        request.then().statusCode( 200 );
-        response = request.jsonPath();
-	body = request.getBody().asString();
-    }
-
-    /**
-     * <pre>
-     * cf. <a href="https://github.com/opengeospatial/ogcapi-processes/blob/master/core/abstract_tests/core/ATS_landingpage-success.adoc">core/abstract_tests/core/ATS_landingpage-success.adoc</a>
-     * </pre>
-     */
-    @Test(description = "Implements Abstract Test 2: /conf/core/landingpage-success", groups = "A.2.1. Landing Page /")
-    public void testLandingPageValidation() {
-
-        Response request = init().baseUri( rootUri.toString() ).accept( JSON ).when().request( GET, "/" );
-        TestSuiteLogger.log(Level.INFO, rootUri.toString());
-        request.then().statusCode( 200 );
-        response = request.jsonPath();    	
-    	
-        List<Object> links = response.getList( "links" );
-        
-        Set<String> linkTypes = collectLinkTypes( links );
-        
-        
-	String required[] = {
-	    "service-desc",
-	    "service-doc",
-	    "http://www.opengis.net/def/rel/ogc/1.0/conformance",
-	    "http://www.opengis.net/def/rel/ogc/1.0/processes"
-	};
-	
-	boolean isValid[] = {
-	    linkTypes.contains( required[0] ),
-	    linkTypes.contains( required[1] ),
-	};
-	// A.2.1.2.3.a Validate that the landing page includes a "service-desc" and/or "service-doc" link to an API Definition.
-	assertTrue( isValid[0] || isValid[1],
-		    "The landing page must include includes a 'service-desc' and/or 'service-doc' link to an API Definition, but contains "
-		    + String.join( ", ", linkTypes ) );
-	// A.2.1.2.3.b Validate that the landing page includes a "http://www.opengis.net/def/rel/ogc/1.0/conformance" link to the conformance class declaration.
-	// A.2.1.2.3.c Validate that the landing page includes a "http://www.opengis.net/def/rel/ogc/1.0/processes" link to the list of processes.
-	
-	for(int i=2;i<required.length;i++){
-		
-	    boolean expectedLinkTypesExists = linkTypes.contains( required[i] );
-	    
-	    
-	    if(required[i].equals("http://www.opengis.net/def/rel/ogc/1.0/conformance") && expectedLinkTypesExists==false) {
-	    	expectedLinkTypesExists = linkTypes.contains("conformance");  //This is added because some servers will implement both OGC API - Features and OGC API - Processes
-	    }
-	    
-	    if(required[i].equals("http://www.opengis.net/def/rel/ogc/1.0/processes") && expectedLinkTypesExists==false) {	    	
-	    	expectedLinkTypesExists = linkTypes.contains("processes");  //This is added because Abstract Test 2 says it should be 'processes' even though Requirement 2 says it should be http://www.opengis.net/def/rel/ogc/1.0/processes
-	    	// The issue was reported at https://github.com/opengeospatial/ogcapi-processes/issues/307
-	    }	    
-	    
-	    
-	    assertTrue( expectedLinkTypesExists,
-			"The landing page must include at least links with relation type '"+required[i]+"', but contains "
-			+ String.join( ", ", linkTypes ) );
+	private JsonPath response;
+
+	private String body;
+
+	// private static String
+	// utrlSchema="http://schemas.opengis.net/ogcapi/common/part1/0.1/core/openapi/schemas/landingPage.json";
+	// private static String
+	// urlSchema="https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/core/openapi/schemas/landingPage.yaml";
+	private static String urlSchema = "http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/landingPage.yaml";
+
+	/**
+	 * <pre>
+	 * cf. <a href=
+	"https://github.com/opengeospatial/ogcapi-processes/blob/master/core/abstract_tests/core/ATS_landingpage-op.adoc">core/abstract_tests/core/ATS_landingpage-op.adoc</a>
+	 * Abstract Test 1: /conf/core/landingpage-op
+	 * Test Purpose: Validate that a landing page can be retrieved from the expected location.
+	 * Requirement: /req/core/root-op
+	 *
+	 * Test Method:
+	 *  1. Issue an HTTP GET request to the URL {root}/
+	 *  2. Validate that a document was returned with a status code 200
+	 *  3. Validate the contents of the returned document using test /conf/core/landingpage-success.
+	 * </pre>
+	 */
+	@Test(description = "Implements Abstract Test 1: /conf/core/landingpage-op", groups = "A.2.1. Landing Page /")
+	public void testLandingPageRetrieval() {
+		Response request = init().baseUri(rootUri.toString()).accept(JSON).when().request(GET, "/");
+		TestSuiteLogger.log(Level.INFO, rootUri.toString());
+		request.then().statusCode(200);
+		response = request.jsonPath();
+		body = request.getBody().asString();
 	}
 
-	
-	// A.2.1.2.2 Validate the landing page for *all supported media types* (only JSON) using the resources and tests identified in Schema and Tests for Landing Pages
-	// /conf/(geojson?)json/content
-	assertTrue( validateResponseAgainstSchema(LandingPage.urlSchema,body),
-		    "The landing page does nto conform to the schema: "+LandingPage.urlSchema);
-
-
-	//checkHtmlConfClass(rootUri.toString()); // DEACTIVATED because we do not parse HTML content.
-	
-    }
-	
-    private Set<String> collectLinkTypes( List<Object> links ) {
-        Set<String> linkTypes = new HashSet<>();
-        for ( Object link : links ) {
-            Map<String, Object> linkMap = (Map<String, Object>) link;
-            Object linkType = linkMap.get( "rel" );
-            linkTypes.add( (String) linkType );
-        }
-        return linkTypes;
-    }
+	/**
+	 * <pre>
+	 * cf. <a href=
+	"https://github.com/opengeospatial/ogcapi-processes/blob/master/core/abstract_tests/core/ATS_landingpage-success.adoc">core/abstract_tests/core/ATS_landingpage-success.adoc</a>
+	 * </pre>
+	 */
+	@Test(description = "Implements Abstract Test 2: /conf/core/landingpage-success", groups = "A.2.1. Landing Page /")
+	public void testLandingPageValidation() {
+
+		Response request = init().baseUri(rootUri.toString()).accept(JSON).when().request(GET, "/");
+		TestSuiteLogger.log(Level.INFO, rootUri.toString());
+		request.then().statusCode(200);
+		response = request.jsonPath();
+
+		List<Object> links = response.getList("links");
+
+		Set<String> linkTypes = collectLinkTypes(links);
+
+		String required[] = { "service-desc", "service-doc", "http://www.opengis.net/def/rel/ogc/1.0/conformance",
+				"http://www.opengis.net/def/rel/ogc/1.0/processes" };
+
+		boolean isValid[] = { linkTypes.contains(required[0]), linkTypes.contains(required[1]), };
+		// A.2.1.2.3.a Validate that the landing page includes a "service-desc" and/or
+		// "service-doc" link to an API Definition.
+		assertTrue(isValid[0] || isValid[1],
+				"The landing page must include includes a 'service-desc' and/or 'service-doc' link to an API Definition, but contains "
+						+ String.join(", ", linkTypes));
+		// A.2.1.2.3.b Validate that the landing page includes a
+		// "http://www.opengis.net/def/rel/ogc/1.0/conformance" link to the conformance
+		// class declaration.
+		// A.2.1.2.3.c Validate that the landing page includes a
+		// "http://www.opengis.net/def/rel/ogc/1.0/processes" link to the list of
+		// processes.
+
+		for (int i = 2; i < required.length; i++) {
+
+			boolean expectedLinkTypesExists = linkTypes.contains(required[i]);
+
+			if (required[i].equals("http://www.opengis.net/def/rel/ogc/1.0/conformance")
+					&& expectedLinkTypesExists == false) {
+				expectedLinkTypesExists = linkTypes.contains("conformance"); // This is
+																				// added
+																				// because
+																				// some
+																				// servers
+																				// will
+																				// implement
+																				// both
+																				// OGC API
+																				// -
+																				// Features
+																				// and OGC
+																				// API -
+																				// Processes
+			}
+
+			if (required[i].equals("http://www.opengis.net/def/rel/ogc/1.0/processes")
+					&& expectedLinkTypesExists == false) {
+				expectedLinkTypesExists = linkTypes.contains("processes"); // This is
+																			// added
+																			// because
+																			// Abstract
+																			// Test 2 says
+																			// it should
+																			// be
+																			// 'processes'
+																			// even though
+																			// Requirement
+																			// 2 says it
+																			// should be
+																			// http://www.opengis.net/def/rel/ogc/1.0/processes
+				// The issue was reported at
+				// https://github.com/opengeospatial/ogcapi-processes/issues/307
+			}
+
+			assertTrue(expectedLinkTypesExists, "The landing page must include at least links with relation type '"
+					+ required[i] + "', but contains " + String.join(", ", linkTypes));
+		}
+
+		// A.2.1.2.2 Validate the landing page for *all supported media types* (only JSON)
+		// using the resources and tests identified in Schema and Tests for Landing Pages
+		// /conf/(geojson?)json/content
+		assertTrue(validateResponseAgainstSchema(LandingPage.urlSchema, body),
+				"The landing page does nto conform to the schema: " + LandingPage.urlSchema);
+
+		// checkHtmlConfClass(rootUri.toString()); // DEACTIVATED because we do not parse
+		// HTML content.
+
+	}
+
+	private Set<String> collectLinkTypes(List<Object> links) {
+		Set<String> linkTypes = new HashSet<>();
+		for (Object link : links) {
+			Map<String, Object> linkMap = (Map<String, Object>) link;
+			Object linkType = linkMap.get("rel");
+			linkTypes.add((String) linkType);
+		}
+		return linkTypes;
+	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/ogcprocessdescription/OGCProcessDescription.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/ogcprocessdescription/OGCProcessDescription.java
index b3beeab..fb74690 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/ogcprocessdescription/OGCProcessDescription.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/ogcprocessdescription/OGCProcessDescription.java
@@ -40,187 +40,200 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**
-*
-* A.3 OGC Process Description
-*
-* @author <a href="mailto:b.pross@52north.org">Benjamin Pross </a>
-*/
+ *
+ * A.3 OGC Process Description
+ *
+ * @author <a href="mailto:b.pross@52north.org">Benjamin Pross </a>
+ */
 public class OGCProcessDescription extends CommonFixture {
 
 	private static final String OPERATION_ID = "getProcessDescription";
 
 	private OpenApi3 openApi3;
-	
+
 	private String getProcessListPath = "/processes";
-	
+
 	private OperationValidator validator;
-    
-    private URL getProcessListURL;
-    
-    private String echoProcessId;
-    private int processTestLimit = 1; //this is a minimum
-    private final int maximumNumberOfProcessesTested = 5;  
-    
+
+	private URL getProcessListURL;
+
+	private String echoProcessId;
+
+	private int processTestLimit = 1; // this is a minimum
+
+	private final int maximumNumberOfProcessesTested = 5;
+
 	@BeforeClass
-	public void setup(ITestContext testContext) {		
-		String processListEndpointString = rootUri.toString() + getProcessListPath;		
+	public void setup(ITestContext testContext) {
+		String processListEndpointString = rootUri.toString() + getProcessListPath;
 		try {
-			echoProcessId = (String) testContext.getSuite().getAttribute( SuiteAttribute.ECHO_PROCESS_ID.getName() );
-			
-			processTestLimit = (Integer) testContext.getSuite().getAttribute( SuiteAttribute.PROCESS_TEST_LIMIT.getName() );
-		
+			echoProcessId = (String) testContext.getSuite().getAttribute(SuiteAttribute.ECHO_PROCESS_ID.getName());
+
+			processTestLimit = (Integer) testContext.getSuite()
+					.getAttribute(SuiteAttribute.PROCESS_TEST_LIMIT.getName());
+
 			openApi3 = new OpenApi3Parser().parse(specURL, false);
 			addServerUnderTest(openApi3);
-		    final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
-		    final Operation operation = openApi3.getOperationById(OPERATION_ID);
-		    validator = new OperationValidator(openApi3, path, operation);
-		    getProcessListURL = new URL(processListEndpointString);
-		} catch (MalformedURLException | ResolutionException | ValidationException e) {
-			Assert.fail("Could set up endpoint: " + processListEndpointString + ". Exception: " + e.getLocalizedMessage());
+			final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
+			final Operation operation = openApi3.getOperationById(OPERATION_ID);
+			validator = new OperationValidator(openApi3, path, operation);
+			getProcessListURL = new URL(processListEndpointString);
+		}
+		catch (MalformedURLException | ResolutionException | ValidationException e) {
+			Assert.fail(
+					"Could set up endpoint: " + processListEndpointString + ". Exception: " + e.getLocalizedMessage());
 		}
 	}
 
-
 	/**
 	 * <pre>
 	 * Abstract Test 48: /conf/ogc-process-description/json-encoding
 	 * Test Purpose: Verify that a JSON-encoded OGC Process Description complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/json-encoding
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	 * 1. Retrieve a description of each process according to test /conf/core/process.
-     *
-     * 2. For each process, verify the contents of the response body validate against the JSON Schema: process.yaml.
+	 *
+	 * 2. For each process, verify the contents of the response body validate against the JSON Schema: process.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/json-encoding", groups = "ogcprocessdescription")
+	@Test(description = "Implements Requirement /req/ogc-process-description/json-encoding",
+			groups = "ogcprocessdescription")
 	public void testOGCProcessDescriptionJSON() {
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-		
-			
+
 			{
-			HttpClient client = HttpClientBuilder.create().build();
-			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
-			HttpResponse httpResponse = client.execute(request);
-			StringWriter writer = new StringWriter();
-			String encoding = StandardCharsets.UTF_8.name();
-			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-			JsonNode processesNode = responseNode.get("processes");
-			if(processesNode.isArray()) {
-				ArrayNode processesArrayNode = (ArrayNode)processesNode;
-				if(testAllProcesses) {
-			
-					for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this
-						
-						JsonNode jsonNode = processesArrayNode.get(i);
-					
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+
 							HttpClient client2 = HttpClientBuilder.create().build();
-							HttpUriRequest request2 = new HttpGet(getProcessListURL.toString()+"/"+jsonNode.get("id").textValue());
+							HttpUriRequest request2 = new HttpGet(
+									getProcessListURL.toString() + "/" + jsonNode.get("id").textValue());
 							request2.setHeader("Accept", "application/json");
-							  this.reqEntity = request2;
+							this.reqEntity = request2;
 							HttpResponse httpResponse2 = client2.execute(request2);
 							StringWriter writer2 = new StringWriter();
 							String encoding2 = StandardCharsets.UTF_8.name();
 							IOUtils.copy(httpResponse2.getEntity().getContent(), writer2, encoding2);
-				                        this.rspEntity = (this.rspEntity == null ? "" : this.rspEntity)  + "\n" + writer2.toString();
+							this.rspEntity = (this.rspEntity == null ? "" : this.rspEntity) + "\n" + writer2.toString();
 							JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
 							Body body2 = Body.from(responseNode2);
 							Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
-							Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2).header(CONTENT_TYPE, contentType2.getValue())
-									.build();
+							Response response2 = new DefaultResponse.Builder(
+									httpResponse2.getStatusLine().getStatusCode()).body(body2)
+											.header(CONTENT_TYPE, contentType2.getValue()).build();
 							validator.validateResponse(response2, data);
-							Assert.assertTrue(data.isValid(), printResults(data.results()));	
-		
+							Assert.assertTrue(data.isValid(), printResults(data.results()));
+
+						}
+					}
+					else { // test echo process only
+
+						HttpClient client2 = HttpClientBuilder.create().build();
+						HttpUriRequest request2 = new HttpGet(getProcessListURL.toString() + "/" + echoProcessId);
+						request2.setHeader("Accept", "application/json");
+						this.reqEntity = request2;
+						HttpResponse httpResponse2 = client2.execute(request2);
+						StringWriter writer2 = new StringWriter();
+						String encoding2 = StandardCharsets.UTF_8.name();
+						IOUtils.copy(httpResponse2.getEntity().getContent(), writer2, encoding2);
+						this.rspEntity = writer2.toString();
+						JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
+						Body body2 = Body.from(responseNode2);
+						Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
+						Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode())
+								.body(body2).header(CONTENT_TYPE, contentType2.getValue()).build();
+						validator.validateResponse(response2, data);
+						Assert.assertTrue(data.isValid(), printResults(data.results()));
 					}
-				}
-				else { //test echo process only
-				
-					HttpClient client2 = HttpClientBuilder.create().build();
-					HttpUriRequest request2 = new HttpGet(getProcessListURL.toString()+"/"+echoProcessId);
-					request2.setHeader("Accept", "application/json");
-					  this.reqEntity = request2;
-					HttpResponse httpResponse2 = client2.execute(request2);
-					StringWriter writer2 = new StringWriter();
-					String encoding2 = StandardCharsets.UTF_8.name();
-					IOUtils.copy(httpResponse2.getEntity().getContent(), writer2, encoding2);
-                                        this.rspEntity = writer2.toString();
-					JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
-					Body body2 = Body.from(responseNode2);
-					Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
-					Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2).header(CONTENT_TYPE, contentType2.getValue())
-							.build();
-					validator.validateResponse(response2, data);
-					Assert.assertTrue(data.isValid(), printResults(data.results()));
 				}
 			}
-			}
-			
-			
-			
-		} catch (Exception e) {
+
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
 		}
 	}
-	
+
 	/**
 	 * <pre>
 	 * Abstract Test 49: /conf/ogc-process-description/inputs-def
 	 * Test Purpose: Verify that the definition of inputs for each process complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/inputs-def
-	 * Test Method: 
+	 * Test Method:
 	 * |===
-     * 1. Retrieve a description of each process according to test /conf/core/process.
-     *
-     * 2. For each process, verify that the definition of the inputs conforms to the JSON Schema: inputDescription.yaml.
+	 * 1. Retrieve a description of each process according to test /conf/core/process.
+	 *
+	 * 2. For each process, verify that the definition of the inputs conforms to the JSON Schema: inputDescription.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/inputs-def", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/inputs-def",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionInputsDef() {
-		//This test depends on the testOGCProcessDescriptionJSON method.
-		//Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionInputsDef test confirms that the validated processes had Inputs defined in them.
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionInputsDef test confirms that the validated processes
+		// had Inputs defined in them.
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-		
-			
+
 			{
-			HttpClient client = HttpClientBuilder.create().build();
-			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
-			HttpResponse httpResponse = client.execute(request);
-			StringWriter writer = new StringWriter();
-			String encoding = StandardCharsets.UTF_8.name();
-			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-		        this.rspEntity = writer.toString();
-			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-			JsonNode processesNode = responseNode.get("processes");
-			if(processesNode.isArray()) {
-				ArrayNode processesArrayNode = (ArrayNode)processesNode;
-				if(testAllProcesses) {
-			
-					for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this
-						
-						JsonNode jsonNode = processesArrayNode.get(i);
-					
-						checkProcessDescriptionHasInputsField(getProcessListURL.toString(),jsonNode.get("id").textValue());
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+
+							checkProcessDescriptionHasInputsField(getProcessListURL.toString(),
+									jsonNode.get("id").textValue());
+						}
+					}
+					else { // test echo process only
+
+						checkProcessDescriptionHasInputsField(getProcessListURL.toString(), echoProcessId);
 					}
-				}
-				else { //test echo process only
-	
-					checkProcessDescriptionHasInputsField(getProcessListURL.toString(),echoProcessId);
 				}
 			}
-			}
-			
-			
-			
-		} catch (Exception e) {
+
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
-		}		
+		}
 	}
 
 	/**
@@ -228,329 +241,375 @@ public void testOGCProcessDescriptionInputsDef() {
 	 * Abstract Test 50: /conf/ogc-process-description/input-def
 	 * Test Purpose: Verify that the definition of each input for each process complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/input-def
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	 * For each input identified according to the test /conf/ogc-process-description/inputs-def verify that the value of the schema key, that defines the input, validates according to the JSON Schema: schema.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/input-def", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/input-def",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionInputDef() {
-		//This test depends on the testOGCProcessDescriptionJSON method.
-		//Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionInputDef test confirms that the validated processes have valid schemas defined in them.
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionInputDef test confirms that the validated processes
+		// have valid schemas defined in them.
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-		
-			
+
 			{
-			HttpClient client = HttpClientBuilder.create().build();
-			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
-			HttpResponse httpResponse = client.execute(request);
-			StringWriter writer = new StringWriter();
-			String encoding = StandardCharsets.UTF_8.name();
-			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-                        this.rspEntity = writer.toString();
-			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-			JsonNode processesNode = responseNode.get("processes");
-			if(processesNode.isArray()) {
-				ArrayNode processesArrayNode = (ArrayNode)processesNode;
-				if(testAllProcesses) {
-			
-					for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this to 5
-						
-						JsonNode jsonNode = processesArrayNode.get(i);						
-						checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),jsonNode.get("id").textValue(),false);
-		
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+																												// to
+																												// 5
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+							checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),
+									jsonNode.get("id").textValue(), false);
+
+						}
+					}
+					else { // test echo process only
+
+						checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(), echoProcessId, false);
+
 					}
 				}
-				else { //test echo process only
-				
-					checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),echoProcessId,false);
-									
-				}
-			}
 			}
-			
-		} catch (Exception e) {
+
+		}
+		catch (Exception e) {
 			Assert.fail(e.getLocalizedMessage());
-		}		
+		}
 	}
-	
 
 	/**
 	 * <pre>
 	 * Abstract Test 51: /conf/ogc-process-description/input-mixed-type
 	 * Test Purpose: Validate that each input of mixed type complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/input-mixed-type
-	 * Test Method: 
+	 * Test Method:
 	 * |===
-     * 1. Retrieve a description of each process according to test /conf/core/process.
-	 * 
-     * 2. For each process identify if the process has one or more inputs of mixed type.
-	 * 
-     * 3. For each sub-schema of each identified input, verify that the definition validates according to the JSON Schema: schema.yaml.
+	 * 1. Retrieve a description of each process according to test /conf/core/process.
+	 *
+	 * 2. For each process identify if the process has one or more inputs of mixed type.
+	 *
+	 * 3. For each sub-schema of each identified input, verify that the definition validates according to the JSON Schema: schema.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/input-mixed-type", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/input-mixed-type",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionInputDefinitionOfMixedType() {
-		//This test depends on the testOGCProcessDescriptionJSON method.
-		//Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionInputDefinitionOfMixedType test confirms that the validated processes have valid schemas defined in them.
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionInputDefinitionOfMixedType test confirms that the
+		// validated processes have valid schemas defined in them.
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-			
+
 			{
-			HttpClient client = HttpClientBuilder.create().build();
-			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
-			HttpResponse httpResponse = client.execute(request);
-			StringWriter writer = new StringWriter();
-			String encoding = StandardCharsets.UTF_8.name();
-			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-                        this.rspEntity = writer.toString();
-			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-			JsonNode processesNode = responseNode.get("processes");
-			if(processesNode.isArray()) {
-				ArrayNode processesArrayNode = (ArrayNode)processesNode;
-				if(testAllProcesses) {
-			
-					for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this to 5
-						
-						JsonNode jsonNode = processesArrayNode.get(i);						
-						checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),jsonNode.get("id").textValue(),true);
-		
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+																												// to
+																												// 5
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+							checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),
+									jsonNode.get("id").textValue(), true);
+
+						}
+					}
+					else { // test echo process only
+
+						checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(), echoProcessId, true);
+
 					}
-				}
-				else { //test echo process only
-				
-					checkEachInputDescriptionOfProcessHasSchema(getProcessListURL.toString(),echoProcessId,true);
-									
 				}
 			}
-			}
-			
-		} catch (SkipException e) {
-	              throw e;
-	        } catch (UnsupportedOperationException e) {
-	              Assert.fail(e.getLocalizedMessage());
-	        } catch (ClientProtocolException e) {
-	              Assert.fail(e.getLocalizedMessage());
-	        } catch (IOException e) {
-	              Assert.fail(e.getLocalizedMessage());
-	        }
-	}
-	
 
+		}
+		catch (SkipException e) {
+			throw e;
+		}
+		catch (UnsupportedOperationException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+		catch (ClientProtocolException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+		catch (IOException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+	}
 
-	
 	/**
 	 * <pre>
 	 * Abstract Test 52: /conf/ogc-process-description/outputs-def
 	 * Test Purpose: Verify that the definition of outputs for each process complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/outputs-def
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	   * 1. Retrieve a description of each process according to test /conf/core/process.
 	   *
 	   * 2. For each process, verify that the definition of the outputs conforms to the JSON Schema: outputDescription.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/outputs-def", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/outputs-def",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionOutputsDef() {
-	  //This test depends on the testOGCProcessDescriptionJSON method.
-	  //Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionOutputsDef test confirms that the validated processes have Outputs defined in them.
-	  final ValidationData<Void> data = new ValidationData<>();
-	  try {
-	  
-	    
-	    {
-	    HttpClient client = HttpClientBuilder.create().build();
-	    HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-	    request.setHeader("Accept", "application/json");
-	      this.reqEntity = request;
-	    HttpResponse httpResponse = client.execute(request);
-	    StringWriter writer = new StringWriter();
-	    String encoding = StandardCharsets.UTF_8.name();
-	    IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-            this.rspEntity = writer.toString();
-	    JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-	    JsonNode processesNode = responseNode.get("processes");
-	    if(processesNode.isArray()) {
-	      ArrayNode processesArrayNode = (ArrayNode)processesNode;
-	      if(testAllProcesses) {
-	    
-	        for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this
-	          
-	          JsonNode jsonNode = processesArrayNode.get(i);
-	        
-	          checkProcessDescriptionHasOutputsField(getProcessListURL.toString(),jsonNode.get("id").textValue());
-	        }
-	      }
-	      else { //test echo process only
-
-	        checkProcessDescriptionHasOutputsField(getProcessListURL.toString(),echoProcessId);
-	      }
-	    }
-	    }
-	    
-	    
-	    
-	  } catch (Exception e) {
-	    Assert.fail(e.getLocalizedMessage());
-	  }		
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionOutputsDef test confirms that the validated processes
+		// have Outputs defined in them.
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+
+			{
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+
+							checkProcessDescriptionHasOutputsField(getProcessListURL.toString(),
+									jsonNode.get("id").textValue());
+						}
+					}
+					else { // test echo process only
+
+						checkProcessDescriptionHasOutputsField(getProcessListURL.toString(), echoProcessId);
+					}
+				}
+			}
+
+		}
+		catch (Exception e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
 	}
-	
 
 	/**
 	 * <pre>
 	 * Abstract Test 53: /conf/ogc-process-description/output-def
 	 * Test Purpose: Verify that the definition of each output for each process complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/output-def
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	 * For each output identified according to the test /conf/ogc-process-description/outputs-def verify that the value of the schema key, that defines the output, validates according to the JSON Schema: schema.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/output-def ", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/output-def ",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionOutputDef() {
-		//This test depends on the testOGCProcessDescriptionJSON method.
-		//Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionOutputDef test confirms that the validated processes have valid schemas defined in them.
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionOutputDef test confirms that the validated processes
+		// have valid schemas defined in them.
 		final ValidationData<Void> data = new ValidationData<>();
 		try {
-		  
-		  {
-		  HttpClient client = HttpClientBuilder.create().build();
-		  HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-		  request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
-		  HttpResponse httpResponse = client.execute(request);
-		  StringWriter writer = new StringWriter();
-		  String encoding = StandardCharsets.UTF_8.name();
-		  IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-                  this.rspEntity = writer.toString();
-		  JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-		  JsonNode processesNode = responseNode.get("processes");
-		  if(processesNode.isArray()) {
-		    ArrayNode processesArrayNode = (ArrayNode)processesNode;
-		    if(testAllProcesses) {
-		  
-		      for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this to 5
-		        
-		        JsonNode jsonNode = processesArrayNode.get(i);						
-		        checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),jsonNode.get("id").textValue(),false);
-
-		      }
-		    }
-		    else { //test echo process only
-		    
-		      checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),echoProcessId,false);
-		              
-		    }
-		  }
-		  }
-		  
-		} catch (Exception e) {
-		  Assert.fail(e.getLocalizedMessage());
-		}		
+
+			{
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+																												// to
+																												// 5
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+							checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),
+									jsonNode.get("id").textValue(), false);
+
+						}
+					}
+					else { // test echo process only
+
+						checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(), echoProcessId,
+								false);
+
+					}
+				}
+			}
+
+		}
+		catch (Exception e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
 
 	}
-	
+
 	/**
 	 * <pre>
 	 * Abstract Test 54: /conf/ogc-process-description/output-mixed-type
 	 * Test Purpose: Validate that each output of mixed type complies with the required structure and contents.
 	 * Requirement: /req/ogc-process-description/output-mixed-type
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	   * 1. Retrieve a description of each process according to test /conf/core/process.
-	 * 
+	 *
 	   * 2. For each process identify if the process has one or more output of mixed type denoted by the use of the oneOf JSON Schema keyword.
-	 * 
+	 *
 	   * 3. For each sub-schema or each identified output, verify that the definition validates according to the JSON Schema: schema.yaml.
 	 * </pre>
 	 */
-	@Test(description = "Implements Requirement /req/ogc-process-description/output-mixed-type", groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
+	@Test(description = "Implements Requirement /req/ogc-process-description/output-mixed-type",
+			groups = "ogcprocessdescription", dependsOnMethods = { "testOGCProcessDescriptionJSON" })
 	public void testOGCProcessDescriptionOutputDefinitionOfMixedType() {
-	  //This test depends on the testOGCProcessDescriptionJSON method.
-	  //Whereas testOGCProcessDescriptionJSON validates process descriptions, the testOGCProcessDescriptionOutputDefinitionOfMixedType test confirms that the validated processes have valid schemas defined in them.
-	  final ValidationData<Void> data = new ValidationData<>();
-	  try {
-	    
-	    {
-	    HttpClient client = HttpClientBuilder.create().build();
-	    HttpUriRequest request = new HttpGet(getProcessListURL.toString());
-	    request.setHeader("Accept", "application/json");
-	      this.reqEntity = request;
-	    HttpResponse httpResponse = client.execute(request);
-	    StringWriter writer = new StringWriter();
-	    String encoding = StandardCharsets.UTF_8.name();
-	    IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-            this.rspEntity = writer.toString();
-	    JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-	    JsonNode processesNode = responseNode.get("processes");
-	    if(processesNode.isArray()) {
-	      ArrayNode processesArrayNode = (ArrayNode)processesNode;
-	      if(testAllProcesses) {
-	    
-	        for (int i=0; i < Math.min(processTestLimit,maximumNumberOfProcessesTested); i++) {  //we intentionally limit this to 5
-	          
-	          JsonNode jsonNode = processesArrayNode.get(i);						
-	          checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),jsonNode.get("id").textValue(),true);
-	  
-	        }
-	      }
-	      else { //test echo process only
-	      
-	        checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),echoProcessId,true);
-	                
-	      }
-	    }
-	    }
-	    
-	  } catch (SkipException e) {
-              throw e;
-          } catch (UnsupportedOperationException e) {
-              Assert.fail(e.getLocalizedMessage());
-          } catch (ClientProtocolException e) {
-              Assert.fail(e.getLocalizedMessage());
-          } catch (IOException e) {
-              Assert.fail(e.getLocalizedMessage());
-          }
+		// This test depends on the testOGCProcessDescriptionJSON method.
+		// Whereas testOGCProcessDescriptionJSON validates process descriptions, the
+		// testOGCProcessDescriptionOutputDefinitionOfMixedType test confirms that the
+		// validated processes have valid schemas defined in them.
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+
+			{
+				HttpClient client = HttpClientBuilder.create().build();
+				HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+				request.setHeader("Accept", "application/json");
+				this.reqEntity = request;
+				HttpResponse httpResponse = client.execute(request);
+				StringWriter writer = new StringWriter();
+				String encoding = StandardCharsets.UTF_8.name();
+				IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+				this.rspEntity = writer.toString();
+				JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+				JsonNode processesNode = responseNode.get("processes");
+				if (processesNode.isArray()) {
+					ArrayNode processesArrayNode = (ArrayNode) processesNode;
+					if (testAllProcesses) {
+
+						for (int i = 0; i < Math.min(processTestLimit, maximumNumberOfProcessesTested); i++) { // we
+																												// intentionally
+																												// limit
+																												// this
+																												// to
+																												// 5
+
+							JsonNode jsonNode = processesArrayNode.get(i);
+							checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(),
+									jsonNode.get("id").textValue(), true);
+
+						}
+					}
+					else { // test echo process only
+
+						checkEachOutputDescriptionOfProcessHasSchema(getProcessListURL.toString(), echoProcessId, true);
+
+					}
+				}
+			}
+
+		}
+		catch (SkipException e) {
+			throw e;
+		}
+		catch (UnsupportedOperationException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+		catch (ClientProtocolException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
+		catch (IOException e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
 	}
-	
 
 	/*
 	 * This method is used by the testOGCProcessDescriptionOutputsDef method.
-	 */	
-	private void checkProcessDescriptionHasOutputsField(String processListURL,String processIdentifier) throws ClientProtocolException, IOException
-	{
-	  HttpClient client2 = HttpClientBuilder.create().build();
-	  HttpUriRequest request2 = new HttpGet(processListURL+"/"+processIdentifier);
-	  request2.setHeader("Accept", "application/json");
-	    this.reqEntity = request2;
-	  HttpResponse httpResponse2 = client2.execute(request2);
-	  StringWriter writer2 = new StringWriter();
-	  String encoding2 = StandardCharsets.UTF_8.name();
-	  IOUtils.copy(httpResponse2.getEntity().getContent(), writer2, encoding2);
-	  JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
-	  Body body2 = Body.from(responseNode2);
-	  Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
-	  Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2).header(CONTENT_TYPE, contentType2.getValue())
-	      .build();
-	  Assert.assertTrue(responseNode2.has("outputs"), "No 'outputs' field was found in the process description of '"+processIdentifier+"'. ");	
+	 */
+	private void checkProcessDescriptionHasOutputsField(String processListURL, String processIdentifier)
+			throws ClientProtocolException, IOException {
+		HttpClient client2 = HttpClientBuilder.create().build();
+		HttpUriRequest request2 = new HttpGet(processListURL + "/" + processIdentifier);
+		request2.setHeader("Accept", "application/json");
+		this.reqEntity = request2;
+		HttpResponse httpResponse2 = client2.execute(request2);
+		StringWriter writer2 = new StringWriter();
+		String encoding2 = StandardCharsets.UTF_8.name();
+		IOUtils.copy(httpResponse2.getEntity().getContent(), writer2, encoding2);
+		JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
+		Body body2 = Body.from(responseNode2);
+		Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
+		Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2)
+				.header(CONTENT_TYPE, contentType2.getValue()).build();
+		Assert.assertTrue(responseNode2.has("outputs"),
+				"No 'outputs' field was found in the process description of '" + processIdentifier + "'. ");
 
 	}
-	
+
 	/*
 	 * This method is used by the testOGCProcessDescriptionInputsDef method.
-	 */	
-	private void checkProcessDescriptionHasInputsField(String processListURL,String processIdentifier) throws ClientProtocolException, IOException
-	{
+	 */
+	private void checkProcessDescriptionHasInputsField(String processListURL, String processIdentifier)
+			throws ClientProtocolException, IOException {
 		HttpClient client2 = HttpClientBuilder.create().build();
-		HttpUriRequest request2 = new HttpGet(processListURL+"/"+processIdentifier);
+		HttpUriRequest request2 = new HttpGet(processListURL + "/" + processIdentifier);
 		request2.setHeader("Accept", "application/json");
-		  this.reqEntity = request2;
+		this.reqEntity = request2;
 		HttpResponse httpResponse2 = client2.execute(request2);
 		StringWriter writer2 = new StringWriter();
 		String encoding2 = StandardCharsets.UTF_8.name();
@@ -558,21 +617,23 @@ private void checkProcessDescriptionHasInputsField(String processListURL,String
 		JsonNode responseNode2 = new ObjectMapper().readTree(writer2.toString());
 		Body body2 = Body.from(responseNode2);
 		Header contentType2 = httpResponse2.getFirstHeader(CONTENT_TYPE);
-		Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2).header(CONTENT_TYPE, contentType2.getValue())
-				.build();
-		Assert.assertTrue(responseNode2.has("inputs"), "No 'inputs' field was found in the process description of '"+processIdentifier+"'. ");	
-	
+		Response response2 = new DefaultResponse.Builder(httpResponse2.getStatusLine().getStatusCode()).body(body2)
+				.header(CONTENT_TYPE, contentType2.getValue()).build();
+		Assert.assertTrue(responseNode2.has("inputs"),
+				"No 'inputs' field was found in the process description of '" + processIdentifier + "'. ");
+
 	}
-	
+
 	/*
-	 * This method is used by the testOGCProcessDescriptionInputDef and testOGCProcessDescriptionInputDefinitionOfMixedType methods.
+	 * This method is used by the testOGCProcessDescriptionInputDef and
+	 * testOGCProcessDescriptionInputDefinitionOfMixedType methods.
 	 */
-	private void checkEachInputDescriptionOfProcessHasSchema(String processListURL,String processIdentifier, boolean checkHasMixedTypeInput) throws ClientProtocolException, IOException
-	{
+	private void checkEachInputDescriptionOfProcessHasSchema(String processListURL, String processIdentifier,
+			boolean checkHasMixedTypeInput) throws ClientProtocolException, IOException {
 		HttpClient client3 = HttpClientBuilder.create().build();
-		HttpUriRequest request3 = new HttpGet(processListURL+"/"+processIdentifier);
+		HttpUriRequest request3 = new HttpGet(processListURL + "/" + processIdentifier);
 		request3.setHeader("Accept", "application/json");
-		  this.reqEntity = request3;
+		this.reqEntity = request3;
 		HttpResponse httpResponse3 = client3.execute(request3);
 		StringWriter writer3 = new StringWriter();
 		String encoding3 = StandardCharsets.UTF_8.name();
@@ -580,42 +641,43 @@ private void checkEachInputDescriptionOfProcessHasSchema(String processListURL,S
 		JsonNode responseNode3 = new ObjectMapper().readTree(writer3.toString());
 		Body body3 = Body.from(responseNode3);
 		Header contentType3 = httpResponse3.getFirstHeader(CONTENT_TYPE);
-		Response response3 = new DefaultResponse.Builder(httpResponse3.getStatusLine().getStatusCode()).body(body3).header(CONTENT_TYPE, contentType3.getValue())
-		    .build();
-		JsonNode inputsNode3 = responseNode3.get("inputs");							
-		Iterator inputsIter3 = inputsNode3.elements();	
+		Response response3 = new DefaultResponse.Builder(httpResponse3.getStatusLine().getStatusCode()).body(body3)
+				.header(CONTENT_TYPE, contentType3.getValue()).build();
+		JsonNode inputsNode3 = responseNode3.get("inputs");
+		Iterator inputsIter3 = inputsNode3.elements();
 		boolean atLeastOneMixedTypeInputFound = false;
-		while(inputsIter3.hasNext()) {
-		  ObjectNode input = (ObjectNode) inputsIter3.next();	
-		  if(input.has("schema"))
-		  {
-			  if(checkHasMixedTypeInput) {
-				  JsonNode schemaNode3 = input.get("schema");	
-				  if(schemaNode3.has("oneOf")) {
-					  atLeastOneMixedTypeInputFound = true;
-				  }
-			  }
-		  }
-		  else {
-		    // fail if there is no schema element
-		    Assert.assertTrue(input.has("schema"), "At least one Input element in the process description of '"+processIdentifier+"' is missing a 'schema' element. ");								
-		  }
+		while (inputsIter3.hasNext()) {
+			ObjectNode input = (ObjectNode) inputsIter3.next();
+			if (input.has("schema")) {
+				if (checkHasMixedTypeInput) {
+					JsonNode schemaNode3 = input.get("schema");
+					if (schemaNode3.has("oneOf")) {
+						atLeastOneMixedTypeInputFound = true;
+					}
+				}
+			}
+			else {
+				// fail if there is no schema element
+				Assert.assertTrue(input.has("schema"), "At least one Input element in the process description of '"
+						+ processIdentifier + "' is missing a 'schema' element. ");
+			}
+		}
+		if (checkHasMixedTypeInput & !atLeastOneMixedTypeInputFound) {
+			throw new SkipException(
+					"No input definition of '" + processIdentifier + "' process identifies a mixed type input");
 		}
-                if(checkHasMixedTypeInput & !atLeastOneMixedTypeInputFound) {
-                    throw new SkipException("No input definition of '"+processIdentifier+"' process identifies a mixed type input");
-                }
 	}
-	
-	
+
 	/*
-	 * This method is used by the testOGCProcessDescriptionOutputDef and testOGCProcessDescriptionOutputDefinitionOfMixedType methods.
+	 * This method is used by the testOGCProcessDescriptionOutputDef and
+	 * testOGCProcessDescriptionOutputDefinitionOfMixedType methods.
 	 */
-	private void checkEachOutputDescriptionOfProcessHasSchema(String processListURL,String processIdentifier, boolean checkHasMixedTypeOutput) throws ClientProtocolException, IOException
-	{
+	private void checkEachOutputDescriptionOfProcessHasSchema(String processListURL, String processIdentifier,
+			boolean checkHasMixedTypeOutput) throws ClientProtocolException, IOException {
 		HttpClient client3 = HttpClientBuilder.create().build();
-		HttpUriRequest request3 = new HttpGet(processListURL+"/"+processIdentifier);
+		HttpUriRequest request3 = new HttpGet(processListURL + "/" + processIdentifier);
 		request3.setHeader("Accept", "application/json");
-		  this.reqEntity = request3;
+		this.reqEntity = request3;
 		HttpResponse httpResponse3 = client3.execute(request3);
 		StringWriter writer3 = new StringWriter();
 		String encoding3 = StandardCharsets.UTF_8.name();
@@ -623,29 +685,31 @@ private void checkEachOutputDescriptionOfProcessHasSchema(String processListURL,
 		JsonNode responseNode3 = new ObjectMapper().readTree(writer3.toString());
 		Body body3 = Body.from(responseNode3);
 		Header contentType3 = httpResponse3.getFirstHeader(CONTENT_TYPE);
-		Response response3 = new DefaultResponse.Builder(httpResponse3.getStatusLine().getStatusCode()).body(body3).header(CONTENT_TYPE, contentType3.getValue())
-		    .build();
-		JsonNode outputsNode3 = responseNode3.get("outputs");							
-		Iterator outputsIter3 = outputsNode3.elements();	
+		Response response3 = new DefaultResponse.Builder(httpResponse3.getStatusLine().getStatusCode()).body(body3)
+				.header(CONTENT_TYPE, contentType3.getValue()).build();
+		JsonNode outputsNode3 = responseNode3.get("outputs");
+		Iterator outputsIter3 = outputsNode3.elements();
 		boolean atLeastOneMixedTypeOutputFound = false;
-		while(outputsIter3.hasNext()) {
-		  ObjectNode output = (ObjectNode) outputsIter3.next();	
-		  if(output.has("schema"))
-		  {
-			  if(checkHasMixedTypeOutput) {
-				  JsonNode schemaNode3 = output.get("schema");	
-				  if(schemaNode3.has("oneOf")) {
-					  atLeastOneMixedTypeOutputFound = true;
-				  }
-			  }
-		  }
-		  else {
-		    // fail if there is no schema element
-		    Assert.assertTrue(output.has("schema"), "At least one Output element in the process description of '"+processIdentifier+"' is missing a 'schema' element. ");								
-		  }
+		while (outputsIter3.hasNext()) {
+			ObjectNode output = (ObjectNode) outputsIter3.next();
+			if (output.has("schema")) {
+				if (checkHasMixedTypeOutput) {
+					JsonNode schemaNode3 = output.get("schema");
+					if (schemaNode3.has("oneOf")) {
+						atLeastOneMixedTypeOutputFound = true;
+					}
+				}
+			}
+			else {
+				// fail if there is no schema element
+				Assert.assertTrue(output.has("schema"), "At least one Output element in the process description of '"
+						+ processIdentifier + "' is missing a 'schema' element. ");
+			}
+		}
+		if (checkHasMixedTypeOutput & !atLeastOneMixedTypeOutputFound) {
+			throw new SkipException(
+					"No output definition of '" + processIdentifier + "' process identifies a mixed type output");
 		}
-                if(checkHasMixedTypeOutput & !atLeastOneMixedTypeOutputFound) {
-                    throw new SkipException("No output definition of '"+processIdentifier+"' process identifies a mixed type output");
-                }
-	}	
+	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/OpenApiUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/OpenApiUtils.java
index 6f97199..c85afd8 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/OpenApiUtils.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/OpenApiUtils.java
@@ -33,567 +33,563 @@
  */
 public class OpenApiUtils {
 
-    // as described in https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#fixed-fields
-    private static final String DEFAULT_SERVER_URL = "/";
-
-    @FunctionalInterface
-    private interface PathMatcherFunction<A, B, C> {
-        A apply( B b, C c );
-    }
-
-    enum PATH {
-
-        CONFORMANCE( "conformance" ), COLLECTIONS( "collections" );
-
-        private String pathItem;
-
-        PATH( String pathItem ) {
-
-            this.pathItem = pathItem;
-        }
-
-        private String getPathItem() {
-            return pathItem;
-        }
-    }
-
-    private static class PathMatcher implements PathMatcherFunction<Boolean, String, String> {
-        @Override
-        public Boolean apply( String pathUnderTest, String pathToMatch ) {
-            UriTemplateParser parser = new UriTemplateParser( pathUnderTest );
-            Matcher matcher = parser.getPattern().matcher( pathToMatch );
-            return matcher.matches();
-        }
-    }
-
-    private static class ExactMatchFilter implements Predicate<TestPoint> {
-
-        private final String requestedPath;
-
-        ExactMatchFilter( String requestedPath ) {
-            this.requestedPath = requestedPath;
-        }
-
-        @Override
-        public boolean test( TestPoint testPoint ) {
-            UriTemplate uriTemplate = new UriTemplate( testPoint.getPath() );
-            Map<String, String> templateReplacement = new HashMap<>( testPoint.getPredefinedTemplateReplacement() );
-            List<String> templateVariables = uriTemplate.getTemplateVariables();
-            for ( String templateVariable : templateVariables ) {
-                if ( !templateReplacement.containsKey( templateVariable ) )
-                    templateReplacement.put( templateVariable, ".*" );
-            }
-            String uri = uriTemplate.createURI( templateReplacement );
-            Pattern pattern = Pattern.compile( uri );
-            return pattern.matcher( requestedPath ).matches();
-        }
-    }
-
-    private OpenApiUtils() {
-    }
-
-    /**
-     * Parse all test points from the passed OpenApi3 document as described in A.4.3. Identify the Test Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    static List<TestPoint> retrieveTestPoints( OpenApi3 apiModel, URI iut ) {
-        List<Path> pathItemObjects = identifyTestPoints( apiModel );
-        List<PathItemAndServer> pathItemAndServers = identifyServerUrls( apiModel, iut, pathItemObjects );
-        return processServerObjects( pathItemAndServers, true );
-    }
-
-    /**
-     * Parse the CONFORMANCE test points from the passed OpenApi3 document as described in A.4.3. Identify the Test
-     * Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForConformance( OpenApi3 apiModel, URI iut ) {
-        return retrieveTestPoints( apiModel, iut, CONFORMANCE, false );
-    }
-
-    /**
-     * Parse the COLLECTIONS METADATA test points from the passed OpenApi3 document as described in A.4.3. Identify the
-     * Test Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForCollectionsMetadata( OpenApi3 apiModel, URI iut ) {
-        return retrieveTestPoints( apiModel, iut, COLLECTIONS, false );
-    }
-
-    /**
-     * Parse the COLLECTION METADATA test points for the passed collectionName including the extended path from the
-     * passed OpenApi3 document as described in A.4.3. Identify the Test Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @param collectionName
-     *            the extended path, may be <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForCollectionMetadata( OpenApi3 apiModel, URI iut, String collectionName ) {
-        StringBuilder requestedPath = new StringBuilder();
-        requestedPath.append( "/" );
-        requestedPath.append( COLLECTIONS.getPathItem() );
-        requestedPath.append( "/" );
-        requestedPath.append( collectionName );
-
-        List<TestPoint> testPoints = retrieveTestPoints( apiModel, iut, requestedPath.toString(), true );
-        return testPoints.stream().filter( new ExactMatchFilter( requestedPath.toString() ) ).collect( Collectors.toList() );
-    }
-
-    /**
-     * Parse the COLLECTIONS test points from the passed OpenApi3 document as described in A.4.3. Identify the Test
-     * Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @param noOfCollection
-     *            the number of collections to return test points for (-1 means the test points of all collections
-     *            should be returned)
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForCollections( OpenApi3 apiModel, URI iut, int noOfCollection ) {
-        StringBuilder requestedPath = new StringBuilder();
-        requestedPath.append( "/" );
-        requestedPath.append( COLLECTIONS.getPathItem() );
-        requestedPath.append( "/.*/items" );
-
-        List<TestPoint> allTestPoints = retrieveTestPoints( apiModel, iut, requestedPath.toString(),
-                                                            ( a, b ) -> a.matches( b ), true );
-        if ( noOfCollection < 0 || allTestPoints.size() <= noOfCollection ) {
-            return allTestPoints;
-        }
-        return allTestPoints.subList( 0, noOfCollection );
-    }
-
-    /**
-     * Parse the test points with the passed path including the extended path from the passed OpenApi3 document as
-     * described in A.4.3. Identify the Test Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @param collectionName
-     *            the extended path, may be <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForCollection( OpenApi3 apiModel, URI iut, String collectionName ) {
-        String requestedPath = createCollectionPath( collectionName );
-
-        List<TestPoint> testPoints = retrieveTestPoints( apiModel, iut, requestedPath, true );
-        return testPoints.stream().filter( new ExactMatchFilter( requestedPath ) ).collect( Collectors.toList() );
-    }
-
-    /**
-     * Parse the test points with the passed path including the extended path from the passed OpenApi3 document as
-     * described in A.4.3. Identify the Test Points.
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            the url of the instance under test, never <code>null</code>
-     * @param collectionName
-     *            the extended path, may be <code>null</code>
-     * @param featureId
-     *            the id of the feature, never <code>null</code>
-     * @return the parsed test points, may be empty but never <code>null</code>
-     */
-    public static List<TestPoint> retrieveTestPointsForFeature( OpenApi3 apiModel, URI iut, String collectionName,
-                                                                String featureId ) {
-        StringBuilder requestedPath = new StringBuilder();
-        requestedPath.append( "/" );
-        requestedPath.append( COLLECTIONS.getPathItem() );
-        requestedPath.append( "/" );
-        requestedPath.append( collectionName );
-        requestedPath.append( "/items/" );
-        requestedPath.append( featureId );
-
-        List<TestPoint> testPoints = retrieveTestPoints( apiModel, iut, requestedPath.toString(), true );
-        return testPoints.stream().filter( new ExactMatchFilter( requestedPath.toString() ) ).collect( Collectors.toList() );
-    }
-
-    public static Parameter retrieveParameterByName( String collectionItemPath, OpenApi3 apiModel, String name ) {
-        Path path = apiModel.getPath( collectionItemPath );
-        if ( path != null ) {
-            for ( Parameter parameter : path.getParameters() )
-                if ( name.equals( parameter.getName() ) )
-                    return parameter;
-            Operation get = path.getOperation( "get" );
-            for ( Parameter parameter : get.getParameters() )
-                if ( name.equals( parameter.getName() ) )
-                    return parameter;
-        }
-        return null;
-    }
-
-    public static boolean isFreeFormParameterSupportedForCollection( OpenApi3 apiModel, String collectionName ) {
-        String requestedPath = createCollectionPath( collectionName );
-
-        List<Path> paths = identifyTestPoints( apiModel, requestedPath, new PathMatcher() );
-        for ( Path path : paths ) {
-            Collection<Parameter> parameters = path.getGet().getParameters();
-            for ( Parameter parameter : parameters ) {
-                if ( parameter.getSchema() != null && parameter.getSchema().isAdditionalProperties() ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    public static boolean isParameterSupportedForCollection( OpenApi3 apiModel, String collectionName,
-                                                             String queryParam ) {
-        String requestedPath = createCollectionPath( collectionName );
-
-        List<Path> paths = identifyTestPoints( apiModel, requestedPath, new PathMatcher() );
-        for ( Path path : paths ) {
-            Collection<Parameter> parameters = path.getGet().getParameters();
-            for ( Parameter parameter : parameters ) {
-                if ( queryParam.equalsIgnoreCase( parameter.getName() ) ) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    private static String createCollectionPath( String collectionName ) {
-        StringBuilder requestedPath = new StringBuilder();
-        requestedPath.append( "/" );
-        requestedPath.append( COLLECTIONS.getPathItem() );
-        requestedPath.append( "/" );
-        requestedPath.append( collectionName );
-        requestedPath.append( "/items" );
-        return requestedPath.toString();
-    }
-
-    private static List<TestPoint> retrieveTestPoints( OpenApi3 apiModel, URI iut, PATH path, boolean allowEmptyTemplateReplacements ) {
-        String requestedPath = "/" + path.getPathItem();
-        return retrieveTestPoints( apiModel, iut, requestedPath, allowEmptyTemplateReplacements );
-    }
-
-    private static List<TestPoint> retrieveTestPoints( OpenApi3 apiModel, URI iut, String requestedPath, boolean allowEmptyTemplateReplacements ) {
-        return retrieveTestPoints( apiModel, iut, requestedPath, new PathMatcher(), allowEmptyTemplateReplacements );
-    }
-
-    private static List<TestPoint> retrieveTestPoints( OpenApi3 apiModel, URI iut, String requestedPath,
-                                                       PathMatcherFunction<Boolean, String, String> pathMatcher, boolean allowEmptyTemplateReplacements ) {
-        List<Path> pathItemObjects = identifyTestPoints( apiModel, requestedPath, pathMatcher );
-        List<PathItemAndServer> pathItemAndServers = identifyServerUrls( apiModel, iut, pathItemObjects );
-        return processServerObjects( pathItemAndServers, allowEmptyTemplateReplacements );
-    }
-
-    /**
-     * A.4.3.1. Identify Test Points:
-     *
-     * a) Purpose: To identify the test points associated with each Path in the OpenAPI document
-     *
-     * b) Pre-conditions:
-     *
-     * An OpenAPI document has been obtained
-     *
-     * A list of URLs for the servers to be included in the compliance test has been provided
-     *
-     * A list of the paths specified in the WFS 3.0 specification
-     *
-     * c) Method:
-     *
-     * FOR EACH paths property in the OpenAPI document If the path name is one of those specified in the WFS 3.0
-     * specification Retrieve the Server URIs using A.4.3.2. FOR EACH Server URI Concatenate the Server URI with the
-     * path name to form a test point. Add that test point to the list.
-     *
-     * d) References: None
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     */
-    private static List<Path> identifyTestPoints( OpenApi3 apiModel ) {
-        List<Path> allTestPoints = new ArrayList<>();
-        for ( PATH path : PATH.values() )
-            allTestPoints.addAll( identifyTestPoints( apiModel, "/" + path.getPathItem(), new PathMatcher() ) );
-        return allTestPoints;
-    }
-
-    private static List<Path> identifyTestPoints( OpenApi3 apiModel, String path,
-                                                  PathMatcherFunction<Boolean, String, String> pathMatch ) {
-        List<Path> pathItems = new ArrayList<>();
-        Map<String, Path> pathItemObjects = apiModel.getPaths();
-        for ( Path pathItemObject : pathItemObjects.values() ) {
-            String pathString = pathItemObject.getPathString();
-            if ( pathMatch.apply( pathString, path ) ) {
-                pathItems.add( pathItemObject );
-            }
-        }
-        return pathItems;
-    }
-
-    /**
-     * A.4.3.2. Identify Server URIs:
-     *
-     * a) Purpose: To identify all server URIs applicable to an OpenAPI Operation Object
-     *
-     * b) Pre-conditions:
-     *
-     * Server Objects from the root level of the OpenAPI document have been obtained
-     *
-     * A Path Item Object has been retrieved
-     *
-     * An Operation Object has been retrieved
-     *
-     * The Operation Object is associated with the Path Item Object
-     *
-     * A list of URLs for the servers to be included in the compliance test has been provided
-     *
-     * c) Method:
-     *
-     * 1) Identify the Server Objects which are in-scope for this operationObject
-     *
-     * IF Server Objects are defined at the Operation level, then those and only those Server Objects apply to that
-     * Operation.
-     *
-     * IF Server Objects are defined at the Path Item level, then those and only those Server Objects apply to that Path
-     * Item.
-     *
-     * IF Server Objects are not defined at the Operation level, then the Server Objects defined for the parent Path
-     * Item apply to that Operation.
-     *
-     * IF Server Objects are not defined at the Path Item level, then the Server Objects defined for the root level
-     * apply to that Path.
-     *
-     * IF no Server Objects are defined at the root level, then the default server object is assumed as described in the
-     * OpenAPI specification.
-     *
-     * 2) Process each Server Object using A.4.3.3.
-     *
-     * 3) Delete any Server URI which does not reference a server on the list of servers to test.
-     *
-     * d) References: None
-     *
-     * @param apiModel
-     *            never <code>null</code>
-     * @param iut
-     *            never <code>null</code>
-     * @param pathItemObjects
-     *            never <code>null</code>
-     */
-    private static List<PathItemAndServer> identifyServerUrls( OpenApi3 apiModel, URI iut, List<Path> pathItemObjects ) {
-        List<PathItemAndServer> pathItemAndServers = new ArrayList<>();
-
-        for ( Path pathItemObject : pathItemObjects ) {
-            Map<String, Operation> operationObjects = pathItemObject.getOperations();
-            for ( Operation operationObject : operationObjects.values() ) {
-                List<String> serverUrls = identifyServerObjects( apiModel, pathItemObject, operationObject );
-                for ( String serverUrl : serverUrls ) {
-                    if ( DEFAULT_SERVER_URL.equalsIgnoreCase( serverUrl ) ) {
-                        serverUrl = iut.toString();
-                    }  else if ( serverUrl.startsWith( "/" ) ) {
-                        URI resolvedUri = iut.resolve( serverUrl );
-                        serverUrl = resolvedUri.toString();
-                    }
-                    PathItemAndServer pathItemAndServer = new PathItemAndServer( pathItemObject, operationObject,
-                                                                                 serverUrl );
-                    pathItemAndServers.add( pathItemAndServer );
-                }
-            }
-        }
-        return pathItemAndServers;
-    }
-
-    /**
-     * A.4.3.3. Process Server Object:
-     *
-     * a) Purpose: To expand the contents of a Server Object into a set of absolute URIs.
-     *
-     * b) Pre-conditions: A Server Object has been retrieved
-     *
-     * c) Method:
-     *
-     * Processing the Server Object results in a set of absolute URIs. This set contains all of the URIs that can be
-     * created given the URI template and variables defined in that Server Object.
-     *
-     * If there are no variables in the URI template, then add the URI to the return set.
-     *
-     * For each variable in the URI template which does not have an enumerated set of valid values:
-     *
-     * generate a URI using the default value,
-     *
-     * add this URI to the return set,
-     *
-     * flag this URI as non-exhaustive
-     *
-     * For each variable in the URI template which has an enumerated set of valid values:
-     *
-     * generate a URI for each value in the enumerated set,
-     *
-     * add each generated URI to the return set.
-     *
-     * Perform this processing in an iterative manner so that there is a unique URI for all possible combinations of
-     * enumerated and default values.
-     *
-     * Convert all relative URIs to absolute URIs by rooting them on the URI to the server hosting the OpenAPI document.
-     *
-     * d) References: None
-     *
-     * @param pathItemAndServers
-     *            never <code>null</code>
-     */
-    private static List<TestPoint> processServerObjects( List<PathItemAndServer> pathItemAndServers, boolean allowEmptyTemplateReplacements ) {
-        List<TestPoint> uris = new ArrayList<>();
-        for ( PathItemAndServer pathItemAndServer : pathItemAndServers ) {
-            processServerObject( uris, pathItemAndServer, allowEmptyTemplateReplacements );
-        }
-        return uris;
-    }
-
-    private static void processServerObject( List<TestPoint> uris, PathItemAndServer pathItemAndServer, boolean allowEmptyTemplateReplacements ) {
-        String pathString = pathItemAndServer.pathItemObject.getPathString();
-        Response response = getResponse(pathItemAndServer);
-        if ( response == null )
-            return;
-        Map<String, MediaType> contentMediaTypes = response.getContentMediaTypes();
-
-        UriTemplate uriTemplate = new UriTemplate( pathItemAndServer.serverUrl + pathString );
-        if ( uriTemplate.getNumberOfTemplateVariables() == 0 ) {
-            TestPoint testPoint = new TestPoint( pathItemAndServer.serverUrl, pathString, contentMediaTypes );
-            uris.add( testPoint );
-        } else {
-            List<Map<String, String>> templateReplacements = collectTemplateReplacements( pathItemAndServer,
-                                                                                          uriTemplate );
-
-            if ( templateReplacements.isEmpty() && allowEmptyTemplateReplacements ) {
-                TestPoint testPoint = new TestPoint( pathItemAndServer.serverUrl, pathString, contentMediaTypes );
-                uris.add( testPoint );
-            } else {
-                for ( Map<String, String> templateReplacement : templateReplacements ) {
-                    TestPoint testPoint = new TestPoint( pathItemAndServer.serverUrl, pathString, templateReplacement,
-                                                         contentMediaTypes );
-                    uris.add( testPoint );
-                }
-            }
-        }
-    }
-
-    private static Response getResponse( PathItemAndServer pathItemAndServer ) {
-        if ( pathItemAndServer.operationObject.hasResponse( "200" ) )
-            return pathItemAndServer.operationObject.getResponse( "200" );
-        if ( pathItemAndServer.operationObject.hasResponse( "default" ) )
-            return pathItemAndServer.operationObject.getResponse( "default" );
-        return null;
-    }
-
-    private static List<Map<String, String>> collectTemplateReplacements( PathItemAndServer pathItemAndServer,
-                                                                          UriTemplate uriTemplate ) {
-        List<Map<String, String>> templateReplacements = new ArrayList<>();
-        Collection<Parameter> parameters = pathItemAndServer.operationObject.getParameters();
-        for ( String templateVariable : uriTemplate.getTemplateVariables() ) {
-            for ( Parameter parameter : parameters ) {
-                if ( templateVariable.equals( parameter.getName() ) ) {
-                    Schema schema = parameter.getSchema();
-                    if ( schema.hasEnums() ) {
-                        addEnumTemplateValues( templateReplacements, templateVariable, schema );
-                    } else if ( schema.getDefault() != null ) {
-                        addDefaultTemplateValue( templateReplacements, templateVariable, schema );
-                    } else {
-                        // TODO: What should be done if the parameter does not have a default value and no
-                        // enumerated set of valid values?
-                    }
-                }
-            }
-        }
-        return templateReplacements;
-    }
-
-    private static void addEnumTemplateValues( List<Map<String, String>> templateReplacements, String templateVariable,
-                                               Schema schema ) {
-        Collection<Object> enums = schema.getEnums();
-        if ( enums.size() == 1 ) {
-            for ( Object enumValue : enums ) {
-                Map<String, String> replacement = new HashMap<>();
-                replacement.put( templateVariable, enumValue.toString() );
-                templateReplacements.add( replacement );
-            }
-        } else {
-            if ( templateReplacements.isEmpty() ) {
-                Map<String, String> replacement = new HashMap<>();
-                templateReplacements.add( replacement );
-            }
-            List<Map<String, String>> templateReplacementsToAdd = new ArrayList<>();
-            for ( Map<String, String> templateReplacement : templateReplacements ) {
-                for ( Object enumValue : enums ) {
-                    Map<String, String> newTemplateReplacement = new HashMap<>();
-                    newTemplateReplacement.putAll( templateReplacement );
-                    newTemplateReplacement.put( templateVariable, enumValue.toString() );
-                    templateReplacementsToAdd.add( newTemplateReplacement );
-                }
-            }
-            templateReplacements.clear();
-            templateReplacements.addAll( templateReplacementsToAdd );
-        }
-    }
-
-    private static void addDefaultTemplateValue( List<Map<String, String>> templateReplacements,
-                                                 String templateVariable, Schema schema ) {
-        if ( templateReplacements.isEmpty() ) {
-            Map<String, String> replacement = new HashMap<>();
-            templateReplacements.add( replacement );
-        }
-        for ( Map<String, String> templateReplacement : templateReplacements ) {
-            templateReplacement.put( templateVariable, schema.getDefault().toString() );
-        }
-    }
-
-    private static List<String> identifyServerObjects( OpenApi3 apiModel, Path pathItemObject, Operation operationObject ) {
-        if ( operationObject.hasServers() )
-            return parseUrls( operationObject.getServers() );
-        if ( pathItemObject.hasServers() )
-            return parseUrls( pathItemObject.getServers() );
-        if ( apiModel.hasServers() )
-            return parseUrls( apiModel.getServers() );
-        return Collections.singletonList( DEFAULT_SERVER_URL );
-    }
-
-    private static List<String> parseUrls( Collection<Server> servers ) {
-        List<String> urls = new ArrayList<>();
-        for ( Server server : servers )
-            urls.add( server.getUrl() );
-        return urls;
-    }
-
-    private static class PathItemAndServer {
-
-        private final Path pathItemObject;
-
-        private Operation operationObject;
-
-        // TODO: must be a server object to consider server variables
-        private String serverUrl;
-
-        private PathItemAndServer( Path pathItemObject, Operation operationObject, String serverUrl ) {
-            this.pathItemObject = pathItemObject;
-            this.operationObject = operationObject;
-            this.serverUrl = serverUrl;
-        }
-
-    }
+	// as described in
+	// https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.0.md#fixed-fields
+	private static final String DEFAULT_SERVER_URL = "/";
+
+	@FunctionalInterface
+	private interface PathMatcherFunction<A, B, C> {
+
+		A apply(B b, C c);
+
+	}
+
+	enum PATH {
+
+		CONFORMANCE("conformance"), COLLECTIONS("collections");
+
+		private String pathItem;
+
+		PATH(String pathItem) {
+
+			this.pathItem = pathItem;
+		}
+
+		private String getPathItem() {
+			return pathItem;
+		}
+
+	}
+
+	private static class PathMatcher implements PathMatcherFunction<Boolean, String, String> {
+
+		@Override
+		public Boolean apply(String pathUnderTest, String pathToMatch) {
+			UriTemplateParser parser = new UriTemplateParser(pathUnderTest);
+			Matcher matcher = parser.getPattern().matcher(pathToMatch);
+			return matcher.matches();
+		}
+
+	}
+
+	private static class ExactMatchFilter implements Predicate<TestPoint> {
+
+		private final String requestedPath;
+
+		ExactMatchFilter(String requestedPath) {
+			this.requestedPath = requestedPath;
+		}
+
+		@Override
+		public boolean test(TestPoint testPoint) {
+			UriTemplate uriTemplate = new UriTemplate(testPoint.getPath());
+			Map<String, String> templateReplacement = new HashMap<>(testPoint.getPredefinedTemplateReplacement());
+			List<String> templateVariables = uriTemplate.getTemplateVariables();
+			for (String templateVariable : templateVariables) {
+				if (!templateReplacement.containsKey(templateVariable))
+					templateReplacement.put(templateVariable, ".*");
+			}
+			String uri = uriTemplate.createURI(templateReplacement);
+			Pattern pattern = Pattern.compile(uri);
+			return pattern.matcher(requestedPath).matches();
+		}
+
+	}
+
+	private OpenApiUtils() {
+	}
+
+	/**
+	 * Parse all test points from the passed OpenApi3 document as described in A.4.3.
+	 * Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	static List<TestPoint> retrieveTestPoints(OpenApi3 apiModel, URI iut) {
+		List<Path> pathItemObjects = identifyTestPoints(apiModel);
+		List<PathItemAndServer> pathItemAndServers = identifyServerUrls(apiModel, iut, pathItemObjects);
+		return processServerObjects(pathItemAndServers, true);
+	}
+
+	/**
+	 * Parse the CONFORMANCE test points from the passed OpenApi3 document as described in
+	 * A.4.3. Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForConformance(OpenApi3 apiModel, URI iut) {
+		return retrieveTestPoints(apiModel, iut, CONFORMANCE, false);
+	}
+
+	/**
+	 * Parse the COLLECTIONS METADATA test points from the passed OpenApi3 document as
+	 * described in A.4.3. Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForCollectionsMetadata(OpenApi3 apiModel, URI iut) {
+		return retrieveTestPoints(apiModel, iut, COLLECTIONS, false);
+	}
+
+	/**
+	 * Parse the COLLECTION METADATA test points for the passed collectionName including
+	 * the extended path from the passed OpenApi3 document as described in A.4.3. Identify
+	 * the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @param collectionName the extended path, may be <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForCollectionMetadata(OpenApi3 apiModel, URI iut,
+			String collectionName) {
+		StringBuilder requestedPath = new StringBuilder();
+		requestedPath.append("/");
+		requestedPath.append(COLLECTIONS.getPathItem());
+		requestedPath.append("/");
+		requestedPath.append(collectionName);
+
+		List<TestPoint> testPoints = retrieveTestPoints(apiModel, iut, requestedPath.toString(), true);
+		return testPoints.stream().filter(new ExactMatchFilter(requestedPath.toString())).collect(Collectors.toList());
+	}
+
+	/**
+	 * Parse the COLLECTIONS test points from the passed OpenApi3 document as described in
+	 * A.4.3. Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @param noOfCollection the number of collections to return test points for (-1 means
+	 * the test points of all collections should be returned)
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForCollections(OpenApi3 apiModel, URI iut, int noOfCollection) {
+		StringBuilder requestedPath = new StringBuilder();
+		requestedPath.append("/");
+		requestedPath.append(COLLECTIONS.getPathItem());
+		requestedPath.append("/.*/items");
+
+		List<TestPoint> allTestPoints = retrieveTestPoints(apiModel, iut, requestedPath.toString(),
+				(a, b) -> a.matches(b), true);
+		if (noOfCollection < 0 || allTestPoints.size() <= noOfCollection) {
+			return allTestPoints;
+		}
+		return allTestPoints.subList(0, noOfCollection);
+	}
+
+	/**
+	 * Parse the test points with the passed path including the extended path from the
+	 * passed OpenApi3 document as described in A.4.3. Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @param collectionName the extended path, may be <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForCollection(OpenApi3 apiModel, URI iut, String collectionName) {
+		String requestedPath = createCollectionPath(collectionName);
+
+		List<TestPoint> testPoints = retrieveTestPoints(apiModel, iut, requestedPath, true);
+		return testPoints.stream().filter(new ExactMatchFilter(requestedPath)).collect(Collectors.toList());
+	}
+
+	/**
+	 * Parse the test points with the passed path including the extended path from the
+	 * passed OpenApi3 document as described in A.4.3. Identify the Test Points.
+	 * @param apiModel never <code>null</code>
+	 * @param iut the url of the instance under test, never <code>null</code>
+	 * @param collectionName the extended path, may be <code>null</code>
+	 * @param featureId the id of the feature, never <code>null</code>
+	 * @return the parsed test points, may be empty but never <code>null</code>
+	 */
+	public static List<TestPoint> retrieveTestPointsForFeature(OpenApi3 apiModel, URI iut, String collectionName,
+			String featureId) {
+		StringBuilder requestedPath = new StringBuilder();
+		requestedPath.append("/");
+		requestedPath.append(COLLECTIONS.getPathItem());
+		requestedPath.append("/");
+		requestedPath.append(collectionName);
+		requestedPath.append("/items/");
+		requestedPath.append(featureId);
+
+		List<TestPoint> testPoints = retrieveTestPoints(apiModel, iut, requestedPath.toString(), true);
+		return testPoints.stream().filter(new ExactMatchFilter(requestedPath.toString())).collect(Collectors.toList());
+	}
+
+	public static Parameter retrieveParameterByName(String collectionItemPath, OpenApi3 apiModel, String name) {
+		Path path = apiModel.getPath(collectionItemPath);
+		if (path != null) {
+			for (Parameter parameter : path.getParameters())
+				if (name.equals(parameter.getName()))
+					return parameter;
+			Operation get = path.getOperation("get");
+			for (Parameter parameter : get.getParameters())
+				if (name.equals(parameter.getName()))
+					return parameter;
+		}
+		return null;
+	}
+
+	public static boolean isFreeFormParameterSupportedForCollection(OpenApi3 apiModel, String collectionName) {
+		String requestedPath = createCollectionPath(collectionName);
+
+		List<Path> paths = identifyTestPoints(apiModel, requestedPath, new PathMatcher());
+		for (Path path : paths) {
+			Collection<Parameter> parameters = path.getGet().getParameters();
+			for (Parameter parameter : parameters) {
+				if (parameter.getSchema() != null && parameter.getSchema().isAdditionalProperties()) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	public static boolean isParameterSupportedForCollection(OpenApi3 apiModel, String collectionName,
+			String queryParam) {
+		String requestedPath = createCollectionPath(collectionName);
+
+		List<Path> paths = identifyTestPoints(apiModel, requestedPath, new PathMatcher());
+		for (Path path : paths) {
+			Collection<Parameter> parameters = path.getGet().getParameters();
+			for (Parameter parameter : parameters) {
+				if (queryParam.equalsIgnoreCase(parameter.getName())) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static String createCollectionPath(String collectionName) {
+		StringBuilder requestedPath = new StringBuilder();
+		requestedPath.append("/");
+		requestedPath.append(COLLECTIONS.getPathItem());
+		requestedPath.append("/");
+		requestedPath.append(collectionName);
+		requestedPath.append("/items");
+		return requestedPath.toString();
+	}
+
+	private static List<TestPoint> retrieveTestPoints(OpenApi3 apiModel, URI iut, PATH path,
+			boolean allowEmptyTemplateReplacements) {
+		String requestedPath = "/" + path.getPathItem();
+		return retrieveTestPoints(apiModel, iut, requestedPath, allowEmptyTemplateReplacements);
+	}
+
+	private static List<TestPoint> retrieveTestPoints(OpenApi3 apiModel, URI iut, String requestedPath,
+			boolean allowEmptyTemplateReplacements) {
+		return retrieveTestPoints(apiModel, iut, requestedPath, new PathMatcher(), allowEmptyTemplateReplacements);
+	}
+
+	private static List<TestPoint> retrieveTestPoints(OpenApi3 apiModel, URI iut, String requestedPath,
+			PathMatcherFunction<Boolean, String, String> pathMatcher, boolean allowEmptyTemplateReplacements) {
+		List<Path> pathItemObjects = identifyTestPoints(apiModel, requestedPath, pathMatcher);
+		List<PathItemAndServer> pathItemAndServers = identifyServerUrls(apiModel, iut, pathItemObjects);
+		return processServerObjects(pathItemAndServers, allowEmptyTemplateReplacements);
+	}
+
+	/**
+	 * A.4.3.1. Identify Test Points:
+	 *
+	 * a) Purpose: To identify the test points associated with each Path in the OpenAPI
+	 * document
+	 *
+	 * b) Pre-conditions:
+	 *
+	 * An OpenAPI document has been obtained
+	 *
+	 * A list of URLs for the servers to be included in the compliance test has been
+	 * provided
+	 *
+	 * A list of the paths specified in the WFS 3.0 specification
+	 *
+	 * c) Method:
+	 *
+	 * FOR EACH paths property in the OpenAPI document If the path name is one of those
+	 * specified in the WFS 3.0 specification Retrieve the Server URIs using A.4.3.2. FOR
+	 * EACH Server URI Concatenate the Server URI with the path name to form a test point.
+	 * Add that test point to the list.
+	 *
+	 * d) References: None
+	 * @param apiModel never <code>null</code>
+	 */
+	private static List<Path> identifyTestPoints(OpenApi3 apiModel) {
+		List<Path> allTestPoints = new ArrayList<>();
+		for (PATH path : PATH.values())
+			allTestPoints.addAll(identifyTestPoints(apiModel, "/" + path.getPathItem(), new PathMatcher()));
+		return allTestPoints;
+	}
+
+	private static List<Path> identifyTestPoints(OpenApi3 apiModel, String path,
+			PathMatcherFunction<Boolean, String, String> pathMatch) {
+		List<Path> pathItems = new ArrayList<>();
+		Map<String, Path> pathItemObjects = apiModel.getPaths();
+		for (Path pathItemObject : pathItemObjects.values()) {
+			String pathString = pathItemObject.getPathString();
+			if (pathMatch.apply(pathString, path)) {
+				pathItems.add(pathItemObject);
+			}
+		}
+		return pathItems;
+	}
+
+	/**
+	 * A.4.3.2. Identify Server URIs:
+	 *
+	 * a) Purpose: To identify all server URIs applicable to an OpenAPI Operation Object
+	 *
+	 * b) Pre-conditions:
+	 *
+	 * Server Objects from the root level of the OpenAPI document have been obtained
+	 *
+	 * A Path Item Object has been retrieved
+	 *
+	 * An Operation Object has been retrieved
+	 *
+	 * The Operation Object is associated with the Path Item Object
+	 *
+	 * A list of URLs for the servers to be included in the compliance test has been
+	 * provided
+	 *
+	 * c) Method:
+	 *
+	 * 1) Identify the Server Objects which are in-scope for this operationObject
+	 *
+	 * IF Server Objects are defined at the Operation level, then those and only those
+	 * Server Objects apply to that Operation.
+	 *
+	 * IF Server Objects are defined at the Path Item level, then those and only those
+	 * Server Objects apply to that Path Item.
+	 *
+	 * IF Server Objects are not defined at the Operation level, then the Server Objects
+	 * defined for the parent Path Item apply to that Operation.
+	 *
+	 * IF Server Objects are not defined at the Path Item level, then the Server Objects
+	 * defined for the root level apply to that Path.
+	 *
+	 * IF no Server Objects are defined at the root level, then the default server object
+	 * is assumed as described in the OpenAPI specification.
+	 *
+	 * 2) Process each Server Object using A.4.3.3.
+	 *
+	 * 3) Delete any Server URI which does not reference a server on the list of servers
+	 * to test.
+	 *
+	 * d) References: None
+	 * @param apiModel never <code>null</code>
+	 * @param iut never <code>null</code>
+	 * @param pathItemObjects never <code>null</code>
+	 */
+	private static List<PathItemAndServer> identifyServerUrls(OpenApi3 apiModel, URI iut, List<Path> pathItemObjects) {
+		List<PathItemAndServer> pathItemAndServers = new ArrayList<>();
+
+		for (Path pathItemObject : pathItemObjects) {
+			Map<String, Operation> operationObjects = pathItemObject.getOperations();
+			for (Operation operationObject : operationObjects.values()) {
+				List<String> serverUrls = identifyServerObjects(apiModel, pathItemObject, operationObject);
+				for (String serverUrl : serverUrls) {
+					if (DEFAULT_SERVER_URL.equalsIgnoreCase(serverUrl)) {
+						serverUrl = iut.toString();
+					}
+					else if (serverUrl.startsWith("/")) {
+						URI resolvedUri = iut.resolve(serverUrl);
+						serverUrl = resolvedUri.toString();
+					}
+					PathItemAndServer pathItemAndServer = new PathItemAndServer(pathItemObject, operationObject,
+							serverUrl);
+					pathItemAndServers.add(pathItemAndServer);
+				}
+			}
+		}
+		return pathItemAndServers;
+	}
+
+	/**
+	 * A.4.3.3. Process Server Object:
+	 *
+	 * a) Purpose: To expand the contents of a Server Object into a set of absolute URIs.
+	 *
+	 * b) Pre-conditions: A Server Object has been retrieved
+	 *
+	 * c) Method:
+	 *
+	 * Processing the Server Object results in a set of absolute URIs. This set contains
+	 * all of the URIs that can be created given the URI template and variables defined in
+	 * that Server Object.
+	 *
+	 * If there are no variables in the URI template, then add the URI to the return set.
+	 *
+	 * For each variable in the URI template which does not have an enumerated set of
+	 * valid values:
+	 *
+	 * generate a URI using the default value,
+	 *
+	 * add this URI to the return set,
+	 *
+	 * flag this URI as non-exhaustive
+	 *
+	 * For each variable in the URI template which has an enumerated set of valid values:
+	 *
+	 * generate a URI for each value in the enumerated set,
+	 *
+	 * add each generated URI to the return set.
+	 *
+	 * Perform this processing in an iterative manner so that there is a unique URI for
+	 * all possible combinations of enumerated and default values.
+	 *
+	 * Convert all relative URIs to absolute URIs by rooting them on the URI to the server
+	 * hosting the OpenAPI document.
+	 *
+	 * d) References: None
+	 * @param pathItemAndServers never <code>null</code>
+	 */
+	private static List<TestPoint> processServerObjects(List<PathItemAndServer> pathItemAndServers,
+			boolean allowEmptyTemplateReplacements) {
+		List<TestPoint> uris = new ArrayList<>();
+		for (PathItemAndServer pathItemAndServer : pathItemAndServers) {
+			processServerObject(uris, pathItemAndServer, allowEmptyTemplateReplacements);
+		}
+		return uris;
+	}
+
+	private static void processServerObject(List<TestPoint> uris, PathItemAndServer pathItemAndServer,
+			boolean allowEmptyTemplateReplacements) {
+		String pathString = pathItemAndServer.pathItemObject.getPathString();
+		Response response = getResponse(pathItemAndServer);
+		if (response == null)
+			return;
+		Map<String, MediaType> contentMediaTypes = response.getContentMediaTypes();
+
+		UriTemplate uriTemplate = new UriTemplate(pathItemAndServer.serverUrl + pathString);
+		if (uriTemplate.getNumberOfTemplateVariables() == 0) {
+			TestPoint testPoint = new TestPoint(pathItemAndServer.serverUrl, pathString, contentMediaTypes);
+			uris.add(testPoint);
+		}
+		else {
+			List<Map<String, String>> templateReplacements = collectTemplateReplacements(pathItemAndServer,
+					uriTemplate);
+
+			if (templateReplacements.isEmpty() && allowEmptyTemplateReplacements) {
+				TestPoint testPoint = new TestPoint(pathItemAndServer.serverUrl, pathString, contentMediaTypes);
+				uris.add(testPoint);
+			}
+			else {
+				for (Map<String, String> templateReplacement : templateReplacements) {
+					TestPoint testPoint = new TestPoint(pathItemAndServer.serverUrl, pathString, templateReplacement,
+							contentMediaTypes);
+					uris.add(testPoint);
+				}
+			}
+		}
+	}
+
+	private static Response getResponse(PathItemAndServer pathItemAndServer) {
+		if (pathItemAndServer.operationObject.hasResponse("200"))
+			return pathItemAndServer.operationObject.getResponse("200");
+		if (pathItemAndServer.operationObject.hasResponse("default"))
+			return pathItemAndServer.operationObject.getResponse("default");
+		return null;
+	}
+
+	private static List<Map<String, String>> collectTemplateReplacements(PathItemAndServer pathItemAndServer,
+			UriTemplate uriTemplate) {
+		List<Map<String, String>> templateReplacements = new ArrayList<>();
+		Collection<Parameter> parameters = pathItemAndServer.operationObject.getParameters();
+		for (String templateVariable : uriTemplate.getTemplateVariables()) {
+			for (Parameter parameter : parameters) {
+				if (templateVariable.equals(parameter.getName())) {
+					Schema schema = parameter.getSchema();
+					if (schema.hasEnums()) {
+						addEnumTemplateValues(templateReplacements, templateVariable, schema);
+					}
+					else if (schema.getDefault() != null) {
+						addDefaultTemplateValue(templateReplacements, templateVariable, schema);
+					}
+					else {
+						// TODO: What should be done if the parameter does not have a
+						// default value and no
+						// enumerated set of valid values?
+					}
+				}
+			}
+		}
+		return templateReplacements;
+	}
+
+	private static void addEnumTemplateValues(List<Map<String, String>> templateReplacements, String templateVariable,
+			Schema schema) {
+		Collection<Object> enums = schema.getEnums();
+		if (enums.size() == 1) {
+			for (Object enumValue : enums) {
+				Map<String, String> replacement = new HashMap<>();
+				replacement.put(templateVariable, enumValue.toString());
+				templateReplacements.add(replacement);
+			}
+		}
+		else {
+			if (templateReplacements.isEmpty()) {
+				Map<String, String> replacement = new HashMap<>();
+				templateReplacements.add(replacement);
+			}
+			List<Map<String, String>> templateReplacementsToAdd = new ArrayList<>();
+			for (Map<String, String> templateReplacement : templateReplacements) {
+				for (Object enumValue : enums) {
+					Map<String, String> newTemplateReplacement = new HashMap<>();
+					newTemplateReplacement.putAll(templateReplacement);
+					newTemplateReplacement.put(templateVariable, enumValue.toString());
+					templateReplacementsToAdd.add(newTemplateReplacement);
+				}
+			}
+			templateReplacements.clear();
+			templateReplacements.addAll(templateReplacementsToAdd);
+		}
+	}
+
+	private static void addDefaultTemplateValue(List<Map<String, String>> templateReplacements, String templateVariable,
+			Schema schema) {
+		if (templateReplacements.isEmpty()) {
+			Map<String, String> replacement = new HashMap<>();
+			templateReplacements.add(replacement);
+		}
+		for (Map<String, String> templateReplacement : templateReplacements) {
+			templateReplacement.put(templateVariable, schema.getDefault().toString());
+		}
+	}
+
+	private static List<String> identifyServerObjects(OpenApi3 apiModel, Path pathItemObject,
+			Operation operationObject) {
+		if (operationObject.hasServers())
+			return parseUrls(operationObject.getServers());
+		if (pathItemObject.hasServers())
+			return parseUrls(pathItemObject.getServers());
+		if (apiModel.hasServers())
+			return parseUrls(apiModel.getServers());
+		return Collections.singletonList(DEFAULT_SERVER_URL);
+	}
+
+	private static List<String> parseUrls(Collection<Server> servers) {
+		List<String> urls = new ArrayList<>();
+		for (Server server : servers)
+			urls.add(server.getUrl());
+		return urls;
+	}
+
+	private static class PathItemAndServer {
+
+		private final Path pathItemObject;
+
+		private Operation operationObject;
+
+		// TODO: must be a server object to consider server variables
+		private String serverUrl;
+
+		private PathItemAndServer(Path pathItemObject, Operation operationObject, String serverUrl) {
+			this.pathItemObject = pathItemObject;
+			this.operationObject = operationObject;
+			this.serverUrl = serverUrl;
+		}
+
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/TestPoint.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/TestPoint.java
index ba1066a..758f9e9 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/TestPoint.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/TestPoint.java
@@ -13,98 +13,93 @@
  */
 public class TestPoint {
 
-    private final String serverUrl;
-
-    private final String path;
-
-    private Map<String, String> predefinedTemplateReplacement;
-
-    private Map<String, MediaType> contentMediaTypes;
-
-    /**
-     * Instantiates a TestPoint with UriTemplate but without predefined replacements.
-     *
-     * @param serverUrl
-     *            the serverUrl, never <code>null</code>
-     * @param path
-     *            the path never, <code>null</code>
-     * @param contentMediaTypes
-     *            the content media types for the GET operation with response "200", may be <code>null</code>
-     */
-    public TestPoint( String serverUrl, String path, Map<String, MediaType> contentMediaTypes ) {
-        this( serverUrl, path, Collections.emptyMap(), contentMediaTypes );
-    }
-
-    /**
-     * Instantiates a TestPoint with UriTemplate and predefined replacements.
-     *
-     * @param serverUrl
-     *            the serverUrl, never <code>null</code>
-     * @param path
-     *            the path, never <code>null</code>
-     * @param predefinedTemplateReplacement
-     *            a list of predefined replacements never <code>null</code>
-     * @param contentMediaTypes
-     *            the content media types for the GET operation with response "200", may be <code>null</code>
-     */
-    public TestPoint( String serverUrl, String path, Map<String, String> predefinedTemplateReplacement,
-                      Map<String, MediaType> contentMediaTypes ) {
-        this.serverUrl = serverUrl;
-        this.path = path;
-        this.predefinedTemplateReplacement = Collections.unmodifiableMap( predefinedTemplateReplacement );
-        this.contentMediaTypes = contentMediaTypes;
-    }
-
-    /**
-     *
-     * @return the serverUrl never <code>null</code>
-     */
-    public String getServerUrl() {
-        return serverUrl;
-    }
-
-    /**
-     * @return the path never, <code>null</code>
-     */
-    public String getPath() {
-        return path;
-    }
-
-    /**
-     * @return an unmodifiable mao with predefined replacements, may be empty but never <code>null</code>
-     */
-    public Map<String, String> getPredefinedTemplateReplacement() {
-        return predefinedTemplateReplacement;
-    }
-
-    /**
-     * @return the content media types for the GET operation with response "200", may be <code>null</code>
-     */
-    public Map<String, MediaType> getContentMediaTypes() {
-        return contentMediaTypes;
-    }
-
-    @Override
-    public String toString() {
-        return "Server URL: " + serverUrl + " , Path: " + path + ", Replacements: " + predefinedTemplateReplacement;
-    }
-
-    @Override
-    public boolean equals( Object o ) {
-        if ( this == o )
-            return true;
-        if ( o == null || getClass() != o.getClass() )
-            return false;
-        TestPoint testPoint = (TestPoint) o;
-        return Objects.equals( serverUrl, testPoint.serverUrl )
-               && Objects.equals( path, testPoint.predefinedTemplateReplacement )
-               && Objects.equals( predefinedTemplateReplacement, testPoint.path )
-               && Objects.equals( contentMediaTypes, testPoint.contentMediaTypes );
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash( serverUrl, path, predefinedTemplateReplacement, contentMediaTypes );
-    }
+	private final String serverUrl;
+
+	private final String path;
+
+	private Map<String, String> predefinedTemplateReplacement;
+
+	private Map<String, MediaType> contentMediaTypes;
+
+	/**
+	 * Instantiates a TestPoint with UriTemplate but without predefined replacements.
+	 * @param serverUrl the serverUrl, never <code>null</code>
+	 * @param path the path never, <code>null</code>
+	 * @param contentMediaTypes the content media types for the GET operation with
+	 * response "200", may be <code>null</code>
+	 */
+	public TestPoint(String serverUrl, String path, Map<String, MediaType> contentMediaTypes) {
+		this(serverUrl, path, Collections.emptyMap(), contentMediaTypes);
+	}
+
+	/**
+	 * Instantiates a TestPoint with UriTemplate and predefined replacements.
+	 * @param serverUrl the serverUrl, never <code>null</code>
+	 * @param path the path, never <code>null</code>
+	 * @param predefinedTemplateReplacement a list of predefined replacements never
+	 * <code>null</code>
+	 * @param contentMediaTypes the content media types for the GET operation with
+	 * response "200", may be <code>null</code>
+	 */
+	public TestPoint(String serverUrl, String path, Map<String, String> predefinedTemplateReplacement,
+			Map<String, MediaType> contentMediaTypes) {
+		this.serverUrl = serverUrl;
+		this.path = path;
+		this.predefinedTemplateReplacement = Collections.unmodifiableMap(predefinedTemplateReplacement);
+		this.contentMediaTypes = contentMediaTypes;
+	}
+
+	/**
+	 * @return the serverUrl never <code>null</code>
+	 */
+	public String getServerUrl() {
+		return serverUrl;
+	}
+
+	/**
+	 * @return the path never, <code>null</code>
+	 */
+	public String getPath() {
+		return path;
+	}
+
+	/**
+	 * @return an unmodifiable mao with predefined replacements, may be empty but never
+	 * <code>null</code>
+	 */
+	public Map<String, String> getPredefinedTemplateReplacement() {
+		return predefinedTemplateReplacement;
+	}
+
+	/**
+	 * @return the content media types for the GET operation with response "200", may be
+	 * <code>null</code>
+	 */
+	public Map<String, MediaType> getContentMediaTypes() {
+		return contentMediaTypes;
+	}
+
+	@Override
+	public String toString() {
+		return "Server URL: " + serverUrl + " , Path: " + path + ", Replacements: " + predefinedTemplateReplacement;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		TestPoint testPoint = (TestPoint) o;
+		return Objects.equals(serverUrl, testPoint.serverUrl)
+				&& Objects.equals(path, testPoint.predefinedTemplateReplacement)
+				&& Objects.equals(predefinedTemplateReplacement, testPoint.path)
+				&& Objects.equals(contentMediaTypes, testPoint.contentMediaTypes);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(serverUrl, path, predefinedTemplateReplacement, contentMediaTypes);
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/UriBuilder.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/UriBuilder.java
index 994f00e..cb8d84d 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/UriBuilder.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/openapi3/UriBuilder.java
@@ -13,76 +13,71 @@
  */
 public class UriBuilder {
 
-    private final TestPoint testPoint;
+	private final TestPoint testPoint;
 
-    private final Map<String, String> templateReplacements = new HashMap<>();
+	private final Map<String, String> templateReplacements = new HashMap<>();
 
-    /**
-     * @param testPoint
-     *            never <code>null</code>
-     */
-    public UriBuilder( TestPoint testPoint ) {
-        this.testPoint = testPoint;
-        this.templateReplacements.putAll( testPoint.getPredefinedTemplateReplacement() );
-    }
+	/**
+	 * @param testPoint never <code>null</code>
+	 */
+	public UriBuilder(TestPoint testPoint) {
+		this.testPoint = testPoint;
+		this.templateReplacements.putAll(testPoint.getPredefinedTemplateReplacement());
+	}
 
-    /**
-     * Adds the collectionName to the URI
-     *
-     * @param collectionName
-     *            never <code>null</code>
-     * @return this UrlBuilder
-     */
-    public UriBuilder collectionName( String collectionName ) {
-        String templateName = retrieveCollectionNameTemplateName();
-        addTemplateReplacement( collectionName, templateName );
-        return this;
-    }
+	/**
+	 * Adds the collectionName to the URI
+	 * @param collectionName never <code>null</code>
+	 * @return this UrlBuilder
+	 */
+	public UriBuilder collectionName(String collectionName) {
+		String templateName = retrieveCollectionNameTemplateName();
+		addTemplateReplacement(collectionName, templateName);
+		return this;
+	}
 
-    /**
-     * Adds the featureId to the URI
-     *
-     * @param featureId
-     *            never <code>null</code>
-     * @return this UrlBuilder
-     */
-    public UriBuilder featureId( String featureId ) {
-        String templateName = retrieveFeatureIdTemplateName();
-        addTemplateReplacement( featureId, templateName );
-        return this;
-    }
+	/**
+	 * Adds the featureId to the URI
+	 * @param featureId never <code>null</code>
+	 * @return this UrlBuilder
+	 */
+	public UriBuilder featureId(String featureId) {
+		String templateName = retrieveFeatureIdTemplateName();
+		addTemplateReplacement(featureId, templateName);
+		return this;
+	}
 
-    /**
-     * @return this URI, never <code>null</code>
-     */
-    public String buildUrl() {
-        UriTemplate uriTemplate = new UriTemplate( testPoint.getServerUrl() + testPoint.getPath() );
-        return uriTemplate.createURI( templateReplacements );
-    }
+	/**
+	 * @return this URI, never <code>null</code>
+	 */
+	public String buildUrl() {
+		UriTemplate uriTemplate = new UriTemplate(testPoint.getServerUrl() + testPoint.getPath());
+		return uriTemplate.createURI(templateReplacements);
+	}
 
-    private void addTemplateReplacement( String collectionName, String templateName ) {
-        if ( templateName != null )
-            templateReplacements.put( templateName, collectionName );
-    }
+	private void addTemplateReplacement(String collectionName, String templateName) {
+		if (templateName != null)
+			templateReplacements.put(templateName, collectionName);
+	}
 
-    private String retrieveCollectionNameTemplateName() {
-        String path = testPoint.getPath();
-        UriTemplateParser uriTemplateParser = new UriTemplateParser( path );
-        for ( String templateName : uriTemplateParser.getNames() ) {
-            if ( path.startsWith( "/collections/{" + templateName + "}" ) )
-                return templateName;
-        }
-        return null;
-    }
+	private String retrieveCollectionNameTemplateName() {
+		String path = testPoint.getPath();
+		UriTemplateParser uriTemplateParser = new UriTemplateParser(path);
+		for (String templateName : uriTemplateParser.getNames()) {
+			if (path.startsWith("/collections/{" + templateName + "}"))
+				return templateName;
+		}
+		return null;
+	}
 
-    private String retrieveFeatureIdTemplateName() {
-        String path = testPoint.getPath();
-        UriTemplateParser uriTemplateParser = new UriTemplateParser( path );
-        for ( String templateName : uriTemplateParser.getNames() ) {
-            if ( path.endsWith( "items/{" + templateName + "}" ) )
-                return templateName;
-        }
-        return null;
-    }
+	private String retrieveFeatureIdTemplateName() {
+		String path = testPoint.getPath();
+		UriTemplateParser uriTemplateParser = new UriTemplateParser(path);
+		for (String templateName : uriTemplateParser.getNames()) {
+			if (path.endsWith("items/{" + templateName + "}"))
+				return templateName;
+		}
+		return null;
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/package-info.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/package-info.java
index ecc1162..ea83a0f 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/package-info.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/package-info.java
@@ -1,8 +1,9 @@
 /**
- * The root package includes supporting classes of general utility such as the
- * main controller, listeners, and reporters.
+ * The root package includes supporting classes of general utility such as the main
+ * controller, listeners, and reporters.
  *
- * <p>Subsidiary packages correspond to distinct test groups such as conformance
- * classes.</p>
+ * <p>
+ * Subsidiary packages correspond to distinct test groups such as conformance classes.
+ * </p>
  */
-package  org.opengis.cite.ogcapiprocesses10;
+package org.opengis.cite.ogcapiprocesses10;
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/process/Process.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/process/Process.java
index bf3d52a..c08b1ad 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/process/Process.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/process/Process.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.opengis.cite.ogcapiprocesses10.process;
 
@@ -48,178 +48,183 @@
  */
 public class Process extends CommonFixture {
 
-    private static final String OPERATION_ID_GET_PROCESS_DESCRIPTION = "getProcessDescription";
-
-    private OpenApi3 openApi3;
-	
-    private String getProcessListPath = "/processes";
-	
-    private OperationValidator getProcessDescriptionValidator;
-    
-    private URL getInvalidProcessURL;
-    
-    private String echoProcessId;
-
-    private String echoProcessPath;
-    
-    @BeforeClass
-    public void setup(ITestContext testContext) {		
-	String processListEndpointString = rootUri.toString() + getProcessListPath;		
-	try {
-	
-	    openApi3 = new OpenApi3Parser().parse(specURL, false);
-	    addServerUnderTest(openApi3);
-	    final Path path = openApi3.getPathItemByOperationId(OPERATION_ID_GET_PROCESS_DESCRIPTION);
-	    final Operation operation = openApi3.getOperationById(OPERATION_ID_GET_PROCESS_DESCRIPTION);
-	    getProcessDescriptionValidator = new OperationValidator(openApi3, path, operation);
-	    getInvalidProcessURL = new URL(processListEndpointString + "/invalid-process-" + UUID.randomUUID());
-	} catch (MalformedURLException | ResolutionException | ValidationException e) {
-	    Assert.fail("Could set up endpoint: " + processListEndpointString + ". Exception: " + e.getLocalizedMessage());
-	}
-	echoProcessId = (String) testContext.getSuite().getAttribute( SuiteAttribute.ECHO_PROCESS_ID.getName() );
-	echoProcessPath = getProcessListPath + "/" + echoProcessId;
-    }
-	
-    /**
-     * <pre>
-     * Abstract Test 15: /conf/core/process-exception-no-such-process
-     * Test Purpose: Validate that an invalid process identifier is handled correctly.
-     * Requirement: /req/core/process-exception-no-such-process
-     * Test Method: 
-     * 1.  Validate that the document contains the exception `type` "http://wwwopengisnet/def/exceptions/ogcapi-processes-1/10/no-such-process"
-     * 2.  Validate the document for all supported media types using the resources and tests identified in no-such-process
-     * |===
-     * 
-     * An exception response caused by the use of an invalid process identifier may be retrieved in a number of different formats. The following table identifies the applicable schema document for each format and the test to be used to validate the response. All supported formats should be exercised.
-     * 
-     * [[no-such-process]]
-     * 3. Schema and Tests for Non-existent Process
-     * [width="90%",cols="3",options="header"]
-     * |===
-     * |Format |Schema Document |Test ID
-     * |HTML |link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/exception.yaml[exception.yaml] |ats_html_content,/conf/html/content
-     * |JSON |link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/exception.yaml[exception.yaml] |ats_json_content,/conf/json/content
-     * |===
-     * TODO: Check additional content
-     * </pre>
-     */
-    @Test(description = "Implements Requirement /req/core/process-exception-no-such-process ", groups = "process")
-    public void testProcessExceptionNoSuchProcess() {
-	final ValidationData<Void> data = new ValidationData<>();
-	try {
-	    HttpClient client = HttpClientBuilder.create().build();
-	    HttpUriRequest request = new HttpGet(getInvalidProcessURL.toString());
-	    this.reqEntity = request;
-	    request.setHeader("Accept", "application/json");
-	    HttpResponse httpResponse = client.execute(request);
-	    StringWriter writer = new StringWriter();
-	    String encoding = StandardCharsets.UTF_8.name();
-	    IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-	    this.rspEntity = writer.toString();
-	    JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-	    Body body = Body.from(responseNode);
-	    //https://github.com/opengeospatial/ets-ogcapi-processes10/issues/14
-	    //Treat Content-Type application/problem+json as application/json for now
-            Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-            String responseContentTypeValue = responseContentType.getValue();
-            if(responseContentTypeValue.equals("application/problem+json")) {
-                responseContentTypeValue = "application/json";
-            }
-	    Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, responseContentTypeValue)
-		.build();
-	    getProcessDescriptionValidator.validateResponse(response, data);
-	    Assert.assertTrue(data.isValid(), printResults(data.results()));
-	} catch (Exception e) {
-	    e.printStackTrace();
-	    Assert.fail(e.getLocalizedMessage());
+	private static final String OPERATION_ID_GET_PROCESS_DESCRIPTION = "getProcessDescription";
+
+	private OpenApi3 openApi3;
+
+	private String getProcessListPath = "/processes";
+
+	private OperationValidator getProcessDescriptionValidator;
+
+	private URL getInvalidProcessURL;
+
+	private String echoProcessId;
+
+	private String echoProcessPath;
+
+	@BeforeClass
+	public void setup(ITestContext testContext) {
+		String processListEndpointString = rootUri.toString() + getProcessListPath;
+		try {
+
+			openApi3 = new OpenApi3Parser().parse(specURL, false);
+			addServerUnderTest(openApi3);
+			final Path path = openApi3.getPathItemByOperationId(OPERATION_ID_GET_PROCESS_DESCRIPTION);
+			final Operation operation = openApi3.getOperationById(OPERATION_ID_GET_PROCESS_DESCRIPTION);
+			getProcessDescriptionValidator = new OperationValidator(openApi3, path, operation);
+			getInvalidProcessURL = new URL(processListEndpointString + "/invalid-process-" + UUID.randomUUID());
+		}
+		catch (MalformedURLException | ResolutionException | ValidationException e) {
+			Assert.fail(
+					"Could set up endpoint: " + processListEndpointString + ". Exception: " + e.getLocalizedMessage());
+		}
+		echoProcessId = (String) testContext.getSuite().getAttribute(SuiteAttribute.ECHO_PROCESS_ID.getName());
+		echoProcessPath = getProcessListPath + "/" + echoProcessId;
 	}
-    }
-
-    /**
-     * <pre>
-     * Abstract Test 13: /conf/core/process
-     * Test Purpose: Validate that a process description can be retrieved from the expected location.
-     * Requirement: /req/core/process
-     * Test Method: 
-     * |===
-     * TODO: Check additional content
-     * </pre>
-     */
-    @Test(description = "Implements Requirement /req/core/process ", groups = "process")
-    public void testProcess() {
-	final ValidationData<Void> data = new ValidationData<>();
-	try {
-	    //Request request = new PathSettingRequest(rootUri.toString(), echoProcessPath, Request.Method.GET);
-	    //getProcessDescriptionValidator.validatePath(request, data);
-
-	    HttpClient client = HttpClientBuilder.create().build();
-	    HttpUriRequest request = new HttpGet(rootUri.toString()+echoProcessPath);
-	    this.reqEntity = request;
-	    request.setHeader("Accept", "application/json");
-	    HttpResponse httpResponse = client.execute(request);
-	    StringWriter writer = new StringWriter();
-	    String encoding = StandardCharsets.UTF_8.name();
-	    IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-            this.rspEntity = writer.toString();
-	    JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-	    Body body = Body.from(responseNode);
-	    Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-	
-	    Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, contentType.getValue())
-		.build();
-	    getProcessDescriptionValidator.validateResponse(response, data);
-	    Assert.assertTrue(data.isValid(), printResults(data.results()));
-	} catch (Exception e) {
-	    e.printStackTrace();
-	    Assert.fail("Could not validate path: " + echoProcessPath + "\n" + printResults(data.results()));
+
+	/**
+	 * <pre>
+	 * Abstract Test 15: /conf/core/process-exception-no-such-process
+	 * Test Purpose: Validate that an invalid process identifier is handled correctly.
+	 * Requirement: /req/core/process-exception-no-such-process
+	 * Test Method:
+	 * 1.  Validate that the document contains the exception `type` "http://wwwopengisnet/def/exceptions/ogcapi-processes-1/10/no-such-process"
+	 * 2.  Validate the document for all supported media types using the resources and tests identified in no-such-process
+	 * |===
+	 *
+	 * An exception response caused by the use of an invalid process identifier may be retrieved in a number of different formats. The following table identifies the applicable schema document for each format and the test to be used to validate the response. All supported formats should be exercised.
+	 *
+	 * [[no-such-process]]
+	 * 3. Schema and Tests for Non-existent Process
+	 * [width="90%",cols="3",options="header"]
+	 * |===
+	 * |Format |Schema Document |Test ID
+	 * |HTML |link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/exception.yaml[exception.yaml] |ats_html_content,/conf/html/content
+	 * |JSON |link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/exception.yaml[exception.yaml] |ats_json_content,/conf/json/content
+	 * |===
+	 * TODO: Check additional content
+	 * </pre>
+	 */
+	@Test(description = "Implements Requirement /req/core/process-exception-no-such-process ", groups = "process")
+	public void testProcessExceptionNoSuchProcess() {
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(getInvalidProcessURL.toString());
+			this.reqEntity = request;
+			request.setHeader("Accept", "application/json");
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
+			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+			this.rspEntity = writer.toString();
+			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+			Body body = Body.from(responseNode);
+			// https://github.com/opengeospatial/ets-ogcapi-processes10/issues/14
+			// Treat Content-Type application/problem+json as application/json for now
+			Header responseContentType = httpResponse.getFirstHeader(CONTENT_TYPE);
+			String responseContentTypeValue = responseContentType.getValue();
+			if (responseContentTypeValue.equals("application/problem+json")) {
+				responseContentTypeValue = "application/json";
+			}
+			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+					.header(CONTENT_TYPE, responseContentTypeValue).build();
+			getProcessDescriptionValidator.validateResponse(response, data);
+			Assert.assertTrue(data.isValid(), printResults(data.results()));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			Assert.fail(e.getLocalizedMessage());
+		}
 	}
-    }
-
-    /**
-     * <pre>
-     * Abstract Test 14: /conf/core/process-success
-     * Test Purpose: Validate that the content complies with the required structure and contents.
-     * Requirement: /req/core/process-success
-     * Test Method: 
-     * |===
-     * 
-     * The interface of a process may be describing using a number of different models or process description languages. The following table identifies the applicable schema document for each process description model described in this standard.
-     * 
-     * [[process-description-model]]
-     * 1. Schema and Tests for Process Description Models
-     * [width="90%",cols="3",options="header"]
-     * |===
-     * |Model |Schema Document |Test ID
-     * |OGC Process Description JSON|link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/process.yaml[process.yaml] |req_ogc-process-description_json-encoding,/conf/ogc-process-description/json-encoding
-     * |===
-     * TODO: Check additional content
-     * </pre>
-     */
-    @Test(description = "Implements Requirement /req/core/process-success ", groups = "process")
-    public void testProcessSuccess() {
-	final ValidationData<Void> data = new ValidationData<>();
-	try {
-	    HttpClient client = HttpClientBuilder.create().build();
-	    HttpUriRequest request = new HttpGet(rootUri + echoProcessPath);
-	    this.reqEntity = request;
-	    request.setHeader("Accept", "application/json");
-	    HttpResponse httpResponse = client.execute(request);
-	    StringWriter writer = new StringWriter();
-	    String encoding = StandardCharsets.UTF_8.name();
-	    IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-            this.rspEntity = writer.toString();
-	    JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
-	    Body body = Body.from(responseNode);
-	    Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-	    Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, contentType.getValue())
-		.build();
-	    getProcessDescriptionValidator.validateResponse(response, data);
-	    Assert.assertTrue(data.isValid(), printResults(data.results()));
-	} catch (Exception e) {
-	    Assert.fail(e.getLocalizedMessage());
+
+	/**
+	 * <pre>
+	 * Abstract Test 13: /conf/core/process
+	 * Test Purpose: Validate that a process description can be retrieved from the expected location.
+	 * Requirement: /req/core/process
+	 * Test Method:
+	 * |===
+	 * TODO: Check additional content
+	 * </pre>
+	 */
+	@Test(description = "Implements Requirement /req/core/process ", groups = "process")
+	public void testProcess() {
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+			// Request request = new PathSettingRequest(rootUri.toString(),
+			// echoProcessPath, Request.Method.GET);
+			// getProcessDescriptionValidator.validatePath(request, data);
+
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(rootUri.toString() + echoProcessPath);
+			this.reqEntity = request;
+			request.setHeader("Accept", "application/json");
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
+			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+			this.rspEntity = writer.toString();
+			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+			Body body = Body.from(responseNode);
+			Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
+
+			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+					.header(CONTENT_TYPE, contentType.getValue()).build();
+			getProcessDescriptionValidator.validateResponse(response, data);
+			Assert.assertTrue(data.isValid(), printResults(data.results()));
+		}
+		catch (Exception e) {
+			e.printStackTrace();
+			Assert.fail("Could not validate path: " + echoProcessPath + "\n" + printResults(data.results()));
+		}
 	}
 
-    }
+	/**
+	 * <pre>
+	 * Abstract Test 14: /conf/core/process-success
+	 * Test Purpose: Validate that the content complies with the required structure and contents.
+	 * Requirement: /req/core/process-success
+	 * Test Method:
+	 * |===
+	 *
+	 * The interface of a process may be describing using a number of different models or process description languages. The following table identifies the applicable schema document for each process description model described in this standard.
+	 *
+	 * [[process-description-model]]
+	 * 1. Schema and Tests for Process Description Models
+	 * [width="90%",cols="3",options="header"]
+	 * |===
+	 * |Model |Schema Document |Test ID
+	 * |OGC Process Description JSON|link:http://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/process.yaml[process.yaml] |req_ogc-process-description_json-encoding,/conf/ogc-process-description/json-encoding
+	 * |===
+	 * TODO: Check additional content
+	 * </pre>
+	 */
+	@Test(description = "Implements Requirement /req/core/process-success ", groups = "process")
+	public void testProcessSuccess() {
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(rootUri + echoProcessPath);
+			this.reqEntity = request;
+			request.setHeader("Accept", "application/json");
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
+			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
+			this.rspEntity = writer.toString();
+			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
+			Body body = Body.from(responseNode);
+			Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
+			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+					.header(CONTENT_TYPE, contentType.getValue()).build();
+			getProcessDescriptionValidator.validateResponse(response, data);
+			Assert.assertTrue(data.isValid(), printResults(data.results()));
+		}
+		catch (Exception e) {
+			Assert.fail(e.getLocalizedMessage());
+		}
 
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/processlist/ProcessList.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/processlist/ProcessList.java
index 2c07fb5..9ce04a0 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/processlist/ProcessList.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/processlist/ProcessList.java
@@ -51,28 +51,30 @@ public class ProcessList extends CommonFixture {
 	private static final String OPERATION_ID = "getProcesses";
 
 	private OpenApi3 openApi3;
-	
+
 	private String getProcessListPath = "/processes";
-	
+
 	private OperationValidator validator;
-    
-    private URL getProcessListURL;
-    
-    private static String urlSchema="https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/processList.yaml";    
-    
+
+	private URL getProcessListURL;
+
+	private static String urlSchema = "https://schemas.opengis.net/ogcapi/processes/part1/1.0/openapi/schemas/processList.yaml";
+
 	@BeforeClass
-	public void setup() {		
-		String processListEndpointString = rootUri.toString() + getProcessListPath;		
-		try {		
+	public void setup() {
+		String processListEndpointString = rootUri.toString() + getProcessListPath;
+		try {
 			openApi3 = new OpenApi3Parser().parse(specURL, false);
 			addServerUnderTest(openApi3);
-		    final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
-		    final Operation operation = openApi3.getOperationById(OPERATION_ID);
-		    validator = new OperationValidator(openApi3, path, operation);
-		    getProcessListURL = new URL(processListEndpointString);
-		} catch (MalformedURLException | ResolutionException | ValidationException e) {	
-			
-			Assert.fail("Could not set up endpoint: " + processListEndpointString + ". Exception: " + e.getLocalizedMessage());
+			final Path path = openApi3.getPathItemByOperationId(OPERATION_ID);
+			final Operation operation = openApi3.getOperationById(OPERATION_ID);
+			validator = new OperationValidator(openApi3, path, operation);
+			getProcessListURL = new URL(processListEndpointString);
+		}
+		catch (MalformedURLException | ResolutionException | ValidationException e) {
+
+			Assert.fail("Could not set up endpoint: " + processListEndpointString + ". Exception: "
+					+ e.getLocalizedMessage());
 		}
 	}
 
@@ -82,17 +84,19 @@ public void setup() {
 	 * Test Purpose: Validate that the `limit` query parameter is constructed correctly.
 	 * Requirement: /req/core/pl-limit-definition
 	 * Test Method:
-	 * 
+	 *
 	 * </pre>
 	 */
 	@Test(description = "Implements Requirement /req/core/pl-limit-definition ", groups = "pl")
 	public void testPlLimitDefinition() {
-	    final ValidationData<Void> data = new ValidationData<>();
-	    try {
-			Request request = new PathSettingRequest(rootUri.toString(), getProcessListPath + "?limit=10", Request.Method.GET);
-		    this.reqEntity = new HttpGet(rootUri.toString() + getProcessListPath + "?limit=10");
+		final ValidationData<Void> data = new ValidationData<>();
+		try {
+			Request request = new PathSettingRequest(rootUri.toString(), getProcessListPath + "?limit=10",
+					Request.Method.GET);
+			this.reqEntity = new HttpGet(rootUri.toString() + getProcessListPath + "?limit=10");
 			validator.validateQuery(request, data);
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			e.printStackTrace();
 			Assert.fail("Could not validate path: " + getProcessListPath + "\n" + printResults(data.results()));
 		}
@@ -104,7 +108,7 @@ public void testPlLimitDefinition() {
 	 * Abstract Test 12: /conf/core/pl-limit-response
 	 * Test Purpose: Validate that the `limit` query parameter is processed correctly.
 	 * Requirement: /req/core/pl-limit-response
-	 * Test Method: 
+	 * Test Method:
 	 * 1.  Verify that this count is not greater than the value specified by the `limit` parameter
 	 * 2.  If the API definition specifies a maximum value for `limit` parameter, verify that the count does not exceed this maximum value
 	 * |===
@@ -118,21 +122,24 @@ public void testPlLimitResponse() {
 			HttpClient client = HttpClientBuilder.create().build();
 			HttpUriRequest request = new HttpGet(testEndpoint);
 			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
+			this.reqEntity = request;
 			HttpResponse httpResponse = client.execute(request);
 			StringWriter writer = new StringWriter();
 			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-		        this.rspEntity = writer.toString();
+			this.rspEntity = writer.toString();
 			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
 			JsonNode processesNode = responseNode.get("processes");
-			if(!(processesNode instanceof ArrayNode)) {
-				Assert.fail("No processes available.");				
-			} else {
-				ArrayNode processesArrayNode = (ArrayNode)processesNode;
-				Assert.assertTrue(processesArrayNode.size() == 1, "Wrong number of processes, expected 1, got " + processesArrayNode.size());
+			if (!(processesNode instanceof ArrayNode)) {
+				Assert.fail("No processes available.");
 			}
-		} catch (Exception e) {
+			else {
+				ArrayNode processesArrayNode = (ArrayNode) processesNode;
+				Assert.assertTrue(processesArrayNode.size() == 1,
+						"Wrong number of processes, expected 1, got " + processesArrayNode.size());
+			}
+		}
+		catch (Exception e) {
 			e.printStackTrace();
 			Assert.fail("Could not validate path: " + testEndpoint);
 		}
@@ -143,7 +150,7 @@ public void testPlLimitResponse() {
 	 * Abstract Test 11: /conf/core/pl-links
 	 * Test Purpose: Validate that the proper links are included in a repsonse.
 	 * Requirement: /req/core/pl-links
-	 * Test Method: 
+	 * Test Method:
 	 * 1.  Verify that the `links` section of the response contains a link with `rel=alternate` for each response representation the service claims to support in its sc_conformance,conformance document
 	 * |===
 	 * TODO: Check additional content
@@ -155,23 +162,26 @@ public void testPlLinks() {
 		try {
 			HttpClient client = HttpClientBuilder.create().build();
 			HttpUriRequest request = new HttpGet(testEndpoint);
-		    this.reqEntity = request;
+			this.reqEntity = request;
 			request.setHeader("Accept", "application/json");
 			HttpResponse httpResponse = client.execute(request);
 			StringWriter writer = new StringWriter();
 			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-		        this.rspEntity = writer.toString();
+			this.rspEntity = writer.toString();
 			JsonNode responseNode = new ObjectMapper().readTree(writer.toString());
 			JsonNode linksNode = responseNode.get("links");
-			if(!(linksNode instanceof ArrayNode)) {
-				Assert.fail("No links available.");				
-			} else {
-				ArrayNode linksArrayNode = (ArrayNode)linksNode;
-//				Assert.assertTrue(linksArrayNode.size() == 1, "Wrong number of processes, expected 1, got " + linksArrayNode.size());
+			if (!(linksNode instanceof ArrayNode)) {
+				Assert.fail("No links available.");
+			}
+			else {
+				ArrayNode linksArrayNode = (ArrayNode) linksNode;
+				// Assert.assertTrue(linksArrayNode.size() == 1, "Wrong number of
+				// processes, expected 1, got " + linksArrayNode.size());
 				Assert.assertNotNull(linksArrayNode);
 			}
-		} catch (Exception e) {
+		}
+		catch (Exception e) {
 			e.printStackTrace();
 			Assert.fail("Could not validate path: " + testEndpoint);
 		}
@@ -182,32 +192,35 @@ public void testPlLinks() {
 	 * Abstract Test 8: /conf/core/process-list
 	 * Test Purpose: Validate that information about the processes can be retrieved from the expected location.
 	 * Requirement: /req/core/process-list
-	 * Test Method: 
+	 * Test Method:
 	 * |===
 	 * TODO: Check additional content
 	 * </pre>
 	 */
 	@Test(description = "Implements Requirement /req/core/process-list ", groups = "processlist")
-	public void testProcessList() {		
+	public void testProcessList() {
 		final ValidationData<Void> data = new ValidationData<>();
-		try { 
-		
-			HttpClient client = HttpClientBuilder.create().build();				
-			HttpUriRequest request = new HttpGet(getProcessListURL.toString());			
-			request.setHeader("Accept", "application/json");		
-		    this.reqEntity = request;	    
-			HttpResponse httpResponse = client.execute(request);			
-			StringWriter writer = new StringWriter();			
-			String encoding = StandardCharsets.UTF_8.name();		
+		try {
+
+			HttpClient client = HttpClientBuilder.create().build();
+			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
+			request.setHeader("Accept", "application/json");
+			this.reqEntity = request;
+			HttpResponse httpResponse = client.execute(request);
+			StringWriter writer = new StringWriter();
+			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-		        this.rspEntity = writer.toString();
-			String responsePayload = writer.toString();		
-			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);		
-			ArrayNode arrayNode = (ArrayNode) responseNode.get("processes");	
-			Assert.assertTrue(arrayNode.size()>0,"No processes listed at "+getProcessListURL.toString());
+			this.rspEntity = writer.toString();
+			String responsePayload = writer.toString();
+			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
+			ArrayNode arrayNode = (ArrayNode) responseNode.get("processes");
+			Assert.assertTrue(arrayNode.size() > 0, "No processes listed at " + getProcessListURL.toString());
 
-		} catch (Exception e) {
-			Assert.fail("ProcessList.testProcessList(): An exception occured when trying to retrieve the processes list from "+getProcessListURL.toString());
+		}
+		catch (Exception e) {
+			Assert.fail(
+					"ProcessList.testProcessList(): An exception occured when trying to retrieve the processes list from "
+							+ getProcessListURL.toString());
 		}
 	}
 
@@ -216,11 +229,11 @@ public void testProcessList() {
 	 * Abstract Test 10: /conf/core/process-list-success
 	 * Test Purpose: Validate that the process list content complies with the required structure and contents.
 	 * Requirement: /req/core/process-list-success
-	 * Test Method: 
+	 * Test Method:
 	 * |===
-	 * 
+	 *
 	 * The process list may be retrieved in a number of different formats. The following table identifies the applicable schema document for each format and the test to be used to validate the against that schema. All supported formats should be exercised.
-	 * 
+	 *
 	 * [[process-list-schema]]
 	 * 1. Schema and Tests for Lists content
 	 * [width="90%",cols="3",options="header"]
@@ -235,29 +248,33 @@ public void testProcessList() {
 	@Test(description = "Implements Requirement /req/core/process-list-success ", groups = "processlist")
 	public void testProcessListSuccess() {
 		final ValidationData<Void> data = new ValidationData<>();
-		try { 
+		try {
 			HttpClient client = HttpClientBuilder.create().build();
 			HttpUriRequest request = new HttpGet(getProcessListURL.toString());
 			request.setHeader("Accept", "application/json");
-		    this.reqEntity = request;
+			this.reqEntity = request;
 			HttpResponse httpResponse = client.execute(request);
 			StringWriter writer = new StringWriter();
 			String encoding = StandardCharsets.UTF_8.name();
 			IOUtils.copy(httpResponse.getEntity().getContent(), writer, encoding);
-                        this.rspEntity = writer.toString();
+			this.rspEntity = writer.toString();
 			String responsePayload = writer.toString();
 			JsonNode responseNode = new ObjectMapper().readTree(responsePayload);
 			Body body = Body.from(responseNode);
 			Header contentType = httpResponse.getFirstHeader(CONTENT_TYPE);
-			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body).header(CONTENT_TYPE, contentType.getValue())
-					.build();
-			validator.validateResponse(response, data);			
-			
-			assertTrue( validateResponseAgainstSchema(ProcessList.urlSchema,responsePayload),
-				    "The response document failed validation against: "+ProcessList.urlSchema+ " ");	
-	
-		} catch (Exception e) {
-			Assert.fail("ProcessList.testProcessListSuccess(): An exception occured when trying to retrieve the processes list from "+getProcessListURL.toString());
+			Response response = new DefaultResponse.Builder(httpResponse.getStatusLine().getStatusCode()).body(body)
+					.header(CONTENT_TYPE, contentType.getValue()).build();
+			validator.validateResponse(response, data);
+
+			assertTrue(validateResponseAgainstSchema(ProcessList.urlSchema, responsePayload),
+					"The response document failed validation against: " + ProcessList.urlSchema + " ");
+
+		}
+		catch (Exception e) {
+			Assert.fail(
+					"ProcessList.testProcessListSuccess(): An exception occured when trying to retrieve the processes list from "
+							+ getProcessListURL.toString());
 		}
 	}
+
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/BBox.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/BBox.java
index d2175c9..3a90767 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/BBox.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/BBox.java
@@ -10,72 +10,68 @@
  */
 public class BBox {
 
-    private static final String PATTERN = "###.0000000";
+	private static final String PATTERN = "###.0000000";
 
-    private final double minX;
+	private final double minX;
 
-    private final double minY;
+	private final double minY;
 
-    private final double maxX;
+	private final double maxX;
 
-    private final double maxY;
+	private final double maxY;
 
-    /**
-     * @param minX
-     *            Lower left corner, coordinate axis 1
-     * @param minY
-     *            Lower left corner, coordinate axis 2
-     * @param maxX
-     *            Upper right corner, coordinate axis 1
-     * @param maxY
-     *            Upper right corner, coordinate axis 2
-     */
-    public BBox( double minX, double minY, double maxX, double maxY ) {
-        this.minX = minX;
-        this.minY = minY;
-        this.maxX = maxX;
-        this.maxY = maxY;
-    }
+	/**
+	 * @param minX Lower left corner, coordinate axis 1
+	 * @param minY Lower left corner, coordinate axis 2
+	 * @param maxX Upper right corner, coordinate axis 1
+	 * @param maxY Upper right corner, coordinate axis 2
+	 */
+	public BBox(double minX, double minY, double maxX, double maxY) {
+		this.minX = minX;
+		this.minY = minY;
+		this.maxX = maxX;
+		this.maxY = maxY;
+	}
 
-    /**
-     * @return the bbox as query string like '-12,10, 12,20'
-     */
-    public String asQueryParameter() {
-        StringBuilder sb = new StringBuilder();
-        DecimalFormat formatter = formatter();
-        sb.append( formatter.format( minX ) ).append( "," );
-        sb.append( formatter.format( minY ) ).append( "," );
-        sb.append( formatter.format( maxX ) ).append( "," );
-        sb.append( formatter.format( maxY ) );
-        return sb.toString();
-    }
+	/**
+	 * @return the bbox as query string like '-12,10, 12,20'
+	 */
+	public String asQueryParameter() {
+		StringBuilder sb = new StringBuilder();
+		DecimalFormat formatter = formatter();
+		sb.append(formatter.format(minX)).append(",");
+		sb.append(formatter.format(minY)).append(",");
+		sb.append(formatter.format(maxX)).append(",");
+		sb.append(formatter.format(maxY));
+		return sb.toString();
+	}
 
-    @Override
-    public String toString() {
-        return asQueryParameter();
-    }
+	@Override
+	public String toString() {
+		return asQueryParameter();
+	}
 
-    @Override
-    public boolean equals( Object o ) {
-        if ( this == o )
-            return true;
-        if ( o == null || getClass() != o.getClass() )
-            return false;
-        BBox bBox = (BBox) o;
-        return Double.compare( bBox.minX, minX ) == 0 && Double.compare( bBox.minY, minY ) == 0
-               && Double.compare( bBox.maxX, maxX ) == 0 && Double.compare( bBox.maxY, maxY ) == 0;
-    }
+	@Override
+	public boolean equals(Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+		BBox bBox = (BBox) o;
+		return Double.compare(bBox.minX, minX) == 0 && Double.compare(bBox.minY, minY) == 0
+				&& Double.compare(bBox.maxX, maxX) == 0 && Double.compare(bBox.maxY, maxY) == 0;
+	}
 
-    @Override
-    public int hashCode() {
-        return Objects.hash( minX, minY, maxX, maxY );
-    }
+	@Override
+	public int hashCode() {
+		return Objects.hash(minX, minY, maxX, maxY);
+	}
 
-    private DecimalFormat formatter() {
-        NumberFormat nf = NumberFormat.getNumberInstance( Locale.ENGLISH );
-        DecimalFormat df = (DecimalFormat) nf;
-        df.applyPattern( PATTERN );
-        return df;
-    }
+	private DecimalFormat formatter() {
+		NumberFormat nf = NumberFormat.getNumberInstance(Locale.ENGLISH);
+		DecimalFormat df = (DecimalFormat) nf;
+		df.applyPattern(PATTERN);
+		return df;
+	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ClientUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ClientUtils.java
index 214c094..2536ebd 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ClientUtils.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ClientUtils.java
@@ -29,146 +29,129 @@
 import org.w3c.dom.Document;
 
 /**
- * Provides various utility methods for creating and configuring HTTP client
- * components.
+ * Provides various utility methods for creating and configuring HTTP client components.
  */
 public class ClientUtils {
 
-    /**
-     * Builds a client component for interacting with HTTP endpoints. The client
-     * will automatically redirect to the URI declared in 3xx responses. The
-     * connection timeout is 10 s. Request and response messages may be logged
-     * to a JDK logger (in the namespace "com.sun.jersey.api.client").
-     *
-     * @return A Client component.
-     */
-    public static Client buildClient() {
-        ClientConfig config = new DefaultClientConfig();
-        config.getProperties().put(
-                ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
-        config.getProperties().put(
-                ClientConfig.PROPERTY_CONNECT_TIMEOUT, 10000);
-        Client client = Client.create(config);
-        client.addFilter(new ReusableEntityFilter());
-        client.addFilter(new LoggingFilter());
-        return client;
-    }
+	/**
+	 * Builds a client component for interacting with HTTP endpoints. The client will
+	 * automatically redirect to the URI declared in 3xx responses. The connection timeout
+	 * is 10 s. Request and response messages may be logged to a JDK logger (in the
+	 * namespace "com.sun.jersey.api.client").
+	 * @return A Client component.
+	 */
+	public static Client buildClient() {
+		ClientConfig config = new DefaultClientConfig();
+		config.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
+		config.getProperties().put(ClientConfig.PROPERTY_CONNECT_TIMEOUT, 10000);
+		Client client = Client.create(config);
+		client.addFilter(new ReusableEntityFilter());
+		client.addFilter(new LoggingFilter());
+		return client;
+	}
 
-    /**
-     * Constructs a client component that uses a specified web proxy. Proxy
-     * authentication is not supported. Configuring the client to use an
-     * intercepting proxy can be useful when debugging a test.
-     *
-     * @param proxyHost The host name or IP address of the proxy server.
-     * @param proxyPort The port number of the proxy listener.
-     *
-     * @return A Client component that submits requests through a web proxy.
-     */
-    public static Client buildClientWithProxy(final String proxyHost,
-            final int proxyPort) {
-        ClientConfig config = new DefaultClientConfig();
-        config.getProperties().put(
-                ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
-        Client client = new Client(new URLConnectionClientHandler(
-                new HttpURLConnectionFactory() {
-                    SocketAddress addr = new InetSocketAddress(proxyHost, proxyPort);
-                    Proxy proxy = new Proxy(Proxy.Type.HTTP, addr);
+	/**
+	 * Constructs a client component that uses a specified web proxy. Proxy authentication
+	 * is not supported. Configuring the client to use an intercepting proxy can be useful
+	 * when debugging a test.
+	 * @param proxyHost The host name or IP address of the proxy server.
+	 * @param proxyPort The port number of the proxy listener.
+	 * @return A Client component that submits requests through a web proxy.
+	 */
+	public static Client buildClientWithProxy(final String proxyHost, final int proxyPort) {
+		ClientConfig config = new DefaultClientConfig();
+		config.getProperties().put(ClientConfig.PROPERTY_FOLLOW_REDIRECTS, true);
+		Client client = new Client(new URLConnectionClientHandler(new HttpURLConnectionFactory() {
+			SocketAddress addr = new InetSocketAddress(proxyHost, proxyPort);
 
-                    @Override
-                    public HttpURLConnection getHttpURLConnection(URL url) throws IOException {
-                        return (HttpURLConnection) url.openConnection(proxy);
-                    }
-                }), config);
-        client.addFilter(new LoggingFilter());
-        return client;
-    }
+			Proxy proxy = new Proxy(Proxy.Type.HTTP, addr);
 
-    /**
-     * Builds an HTTP request message that uses the GET method.
-     *
-     * @param endpoint A URI indicating the target resource.
-     * @param qryParams A Map containing query parameters (may be null);
-     * @param mediaTypes A list of acceptable media types; if not specified,
-     * generic XML ("application/xml") is preferred.
-     *
-     * @return A ClientRequest object.
-     */
-    public static ClientRequest buildGetRequest(URI endpoint,
-            Map<String, String> qryParams, MediaType... mediaTypes) {
-        UriBuilder uriBuilder = UriBuilder.fromUri(endpoint);
-        if (null != qryParams) {
-            for (Map.Entry<String, String> param : qryParams.entrySet()) {
-                uriBuilder.queryParam(param.getKey(), param.getValue());
-            }
-        }
-        URI uri = uriBuilder.build();
-        ClientRequest.Builder reqBuilder = ClientRequest.create();
-        if (null == mediaTypes || mediaTypes.length == 0) {
-            reqBuilder = reqBuilder.accept(MediaType.APPLICATION_XML_TYPE);
-        } else {
-            reqBuilder = reqBuilder.accept(mediaTypes);
-        }
-        ClientRequest req = reqBuilder.build(uri, HttpMethod.GET);
-        return req;
-    }
+			@Override
+			public HttpURLConnection getHttpURLConnection(URL url) throws IOException {
+				return (HttpURLConnection) url.openConnection(proxy);
+			}
+		}), config);
+		client.addFilter(new LoggingFilter());
+		return client;
+	}
 
-    /**
-     * Creates a copy of the given MediaType object but without any parameters.
-     *
-     * @param mediaType A MediaType descriptor.
-     * @return A new (immutable) MediaType object having the same type and
-     * subtype.
-     */
-    public static MediaType removeParameters(MediaType mediaType) {
-        return new MediaType(mediaType.getType(), mediaType.getSubtype());
-    }
+	/**
+	 * Builds an HTTP request message that uses the GET method.
+	 * @param endpoint A URI indicating the target resource.
+	 * @param qryParams A Map containing query parameters (may be null);
+	 * @param mediaTypes A list of acceptable media types; if not specified, generic XML
+	 * ("application/xml") is preferred.
+	 * @return A ClientRequest object.
+	 */
+	public static ClientRequest buildGetRequest(URI endpoint, Map<String, String> qryParams, MediaType... mediaTypes) {
+		UriBuilder uriBuilder = UriBuilder.fromUri(endpoint);
+		if (null != qryParams) {
+			for (Map.Entry<String, String> param : qryParams.entrySet()) {
+				uriBuilder.queryParam(param.getKey(), param.getValue());
+			}
+		}
+		URI uri = uriBuilder.build();
+		ClientRequest.Builder reqBuilder = ClientRequest.create();
+		if (null == mediaTypes || mediaTypes.length == 0) {
+			reqBuilder = reqBuilder.accept(MediaType.APPLICATION_XML_TYPE);
+		}
+		else {
+			reqBuilder = reqBuilder.accept(mediaTypes);
+		}
+		ClientRequest req = reqBuilder.build(uri, HttpMethod.GET);
+		return req;
+	}
 
-    /**
-     * Obtains the (XML) response entity as a JAXP Source object and resets the
-     * entity input stream for subsequent reads.
-     *
-     * @param response A representation of an HTTP response message.
-     * @param targetURI The target URI from which the entity was retrieved (may
-     * be null).
-     * @return A Source to read the entity from; its system identifier is set
-     * using the given targetURI value (this may be used to resolve any relative
-     * URIs found in the source).
-     */
-    public static Source getResponseEntityAsSource(ClientResponse response,
-            String targetURI) {
-        Source source = response.getEntity(DOMSource.class);
-        if (null != targetURI && !targetURI.isEmpty()) {
-            source.setSystemId(targetURI);
-        }
-        if (response.getEntityInputStream().markSupported()) {
-            try {
-                // NOTE: entity was buffered by client filter
-                response.getEntityInputStream().reset();
-            } catch (IOException ex) {
-                Logger.getLogger(ClientUtils.class.getName()).log(Level.WARNING,
-                        "Failed to reset response entity.", ex);
-            }
-        }
-        return source;
-    }
+	/**
+	 * Creates a copy of the given MediaType object but without any parameters.
+	 * @param mediaType A MediaType descriptor.
+	 * @return A new (immutable) MediaType object having the same type and subtype.
+	 */
+	public static MediaType removeParameters(MediaType mediaType) {
+		return new MediaType(mediaType.getType(), mediaType.getSubtype());
+	}
+
+	/**
+	 * Obtains the (XML) response entity as a JAXP Source object and resets the entity
+	 * input stream for subsequent reads.
+	 * @param response A representation of an HTTP response message.
+	 * @param targetURI The target URI from which the entity was retrieved (may be null).
+	 * @return A Source to read the entity from; its system identifier is set using the
+	 * given targetURI value (this may be used to resolve any relative URIs found in the
+	 * source).
+	 */
+	public static Source getResponseEntityAsSource(ClientResponse response, String targetURI) {
+		Source source = response.getEntity(DOMSource.class);
+		if (null != targetURI && !targetURI.isEmpty()) {
+			source.setSystemId(targetURI);
+		}
+		if (response.getEntityInputStream().markSupported()) {
+			try {
+				// NOTE: entity was buffered by client filter
+				response.getEntityInputStream().reset();
+			}
+			catch (IOException ex) {
+				Logger.getLogger(ClientUtils.class.getName()).log(Level.WARNING, "Failed to reset response entity.",
+						ex);
+			}
+		}
+		return source;
+	}
+
+	/**
+	 * Obtains the (XML) response entity as a DOM Document and resets the entity input
+	 * stream for subsequent reads.
+	 * @param response A representation of an HTTP response message.
+	 * @param targetURI The target URI from which the entity was retrieved (may be null).
+	 * @return A Document representing the entity; its base URI is set using the given
+	 * targetURI value (this may be used to resolve any relative URIs found in the
+	 * document).
+	 */
+	public static Document getResponseEntityAsDocument(ClientResponse response, String targetURI) {
+		DOMSource domSource = (DOMSource) getResponseEntityAsSource(response, targetURI);
+		Document entityDoc = (Document) domSource.getNode();
+		entityDoc.setDocumentURI(domSource.getSystemId());
+		return entityDoc;
+	}
 
-    /**
-     * Obtains the (XML) response entity as a DOM Document and resets the entity
-     * input stream for subsequent reads.
-     *
-     * @param response A representation of an HTTP response message.
-     * @param targetURI The target URI from which the entity was retrieved (may
-     * be null).
-     * @return A Document representing the entity; its base URI is set using the
-     * given targetURI value (this may be used to resolve any relative URIs
-     * found in the document).
-     */
-    public static Document getResponseEntityAsDocument(ClientResponse response,
-            String targetURI) {
-        DOMSource domSource = (DOMSource) getResponseEntityAsSource(response,
-                targetURI);
-        Document entityDoc = (Document) domSource.getNode();
-        entityDoc.setDocumentURI(domSource.getSystemId());
-        return entityDoc;
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ExecutionMode.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ExecutionMode.java
index 28289e3..126cb1f 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ExecutionMode.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/ExecutionMode.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.opengis.cite.ogcapiprocesses10.util;
 
@@ -8,46 +8,46 @@
  *
  */
 public enum ExecutionMode {
-	
-	    /**
-	     * Synchronous execution mode.
-	     */
-	    SYNC("sync"),
-	    /**
-	     * Asynchronous execution mode.
-	     */
-	    ASYNC("async"),
-	    /**
-	     * Auto execution mode.
-	     */
-	    AUTO("auto");
-
-	    private final String stringRepresentation;
-
-	    public final String getStringRepresentation() {
-	        return stringRepresentation;
-	    }
-
-	    ExecutionMode(String stringRepresentation) {
-	        this.stringRepresentation = stringRepresentation;
-	    }
-
-	    public static ExecutionMode fromString(String type) {
-	        for (ExecutionMode c : ExecutionMode.values()) {
-	            if (c.getStringRepresentation().equalsIgnoreCase(type)) {
-	                return c;
-	            }
-	        }
-	        throw new IllegalArgumentException(type);
-	    }
-
-	    public static String toString(ExecutionMode type) {
-	        return type.stringRepresentation;
-	    }
-
-	    @Override
-	    public String toString() {
-	        return toString(this);
-	    }
+
+	/**
+	 * Synchronous execution mode.
+	 */
+	SYNC("sync"),
+	/**
+	 * Asynchronous execution mode.
+	 */
+	ASYNC("async"),
+	/**
+	 * Auto execution mode.
+	 */
+	AUTO("auto");
+
+	private final String stringRepresentation;
+
+	public final String getStringRepresentation() {
+		return stringRepresentation;
+	}
+
+	ExecutionMode(String stringRepresentation) {
+		this.stringRepresentation = stringRepresentation;
+	}
+
+	public static ExecutionMode fromString(String type) {
+		for (ExecutionMode c : ExecutionMode.values()) {
+			if (c.getStringRepresentation().equalsIgnoreCase(type)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(type);
+	}
+
+	public static String toString(ExecutionMode type) {
+		return type.stringRepresentation;
+	}
+
+	@Override
+	public String toString() {
+		return toString(this);
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java
index 7602898..f386f5e 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/JsonUtils.java
@@ -33,403 +33,379 @@
  */
 public class JsonUtils {
 
-    private static ObjectMapper objectMapper;
-    
-    private JsonUtils() {
-    }
-
-    /**
-     * Parses the id of the first feature from the passed json.
-     * 
-     * @param collectionItemJson
-     *            the json document containing the features, never <code>null</code>
-     * @return the parsed id, may be <code>null</code> if no feature could be found
-     */
-    public static String parseFeatureId( JsonPath collectionItemJson ) {
-        List<Map<String, Object>> features = collectionItemJson.get( "features" );
-        if ( features == null )
-            return null;
-        for ( Map<String, Object> feature : features ) {
-            if ( feature.containsKey( "id" ) )
-                return feature.get( "id" ).toString();
-        }
-        return null;
-    }
-
-    /**
-     * Parses the temporal extent from the passed collection.
-     *
-     * @param collection
-     *            the collection containing the extent to parse, never <code>null</code>
-     * @return the parsed temporal extent, <code>null</code> if no extent exists
-     * @throws IllegalArgumentException
-     *             if the number of items in the extent invalid
-     *
-     */
-    public static TemporalExtent parseTemporalExtent( Map<String, Object> collection ) {
-        Object extent = collection.get( "extent" );
-        if ( extent == null || !( extent instanceof Map ) )
-            return null;
-        Object spatial = ( (Map<String, Object>) extent ).get( "temporal" );
-        if ( spatial == null || !( spatial instanceof List ) )
-            return null;
-        List<Object> coords = (List<Object>) spatial;
-        if ( coords.size() == 2 ) {
-            ZonedDateTime begin = parseAsDate( (String) coords.get( 0 ) );
-            ZonedDateTime end = parseAsDate( (String) coords.get( 1 ) );
-            return new TemporalExtent( begin, end );
-        }
-        throw new IllegalArgumentException( "Temporal extent with " + coords.size() + " items is invalid" );
-    }
-
-    /**
-     * Parses the passed string as ISO 8601 date.
-     * 
-     * @param dateTime
-     *            the dateTime to parse, never <code>null</code>
-     * @return the parsed date, never <code>null</code>
-     */
-    public static ZonedDateTime parseAsDate( String dateTime ) {
-        return ZonedDateTime.parse( dateTime );
-    }
-
-    /**
-     * Formats the passed string as ISO 8601 date. Example: "2018-02-12T23:20:50Z"
-     *
-     * @param dateTime
-     *            the dateTime to format, never <code>null</code>
-     * @return the formatted date, never <code>null</code>
-     */
-    public static String formatDate( ZonedDateTime dateTime ) {
-        return DateTimeFormatter.ISO_INSTANT.format( dateTime );
-    }
-
-    /**
-     * Formats the passed string as ISO 8601 date. Example: "2018-02-12"
-     *
-     * @param date
-     *            the dateTime to format, never <code>null</code>
-     * @return the formatted date, never <code>null</code>
-     */
-    public static String formatDate( LocalDate date ) {
-        return DateTimeFormatter.ISO_DATE.format( date );
-    }
-
-    /**
-     * Formats the passed string as a period using a start and end time. Example:
-     * "2018-02-12T00:00:00Z/2018-03-18T12:31:12Z"
-     *
-     * @param beginDateTime
-     *            the begin dateTime to format, never <code>null</code>
-     * @param endDateTime
-     *            the end dateTime to format, never <code>null</code>
-     * @return the formatted date, never <code>null</code>
-     */
-    public static String formatDateRange( ZonedDateTime beginDateTime, ZonedDateTime endDateTime ) {
-        return formatDate( beginDateTime ) + "/" + formatDate( endDateTime );
-    }
-
-    /**
-     * Formats the passed string as a period using start time and a duration. Example:
-     * "2018-02-12T00:00:00Z/P1M6DT12H31M12S"
-     *
-     * @param beginDate
-     *            the begin date to format, never <code>null</code>
-     * @param endDate
-     *            the end date to format, never <code>null</code>
-     * @return the formatted date, never <code>null</code>
-     */
-    public static String formatDateRangeWithDuration( LocalDate beginDate, LocalDate endDate ) {
-        Period betweenDate = Period.between( beginDate, endDate );
-        return formatDate( beginDate ) + "/" + betweenDate;
-    }
-
-    /**
-     * Parses the spatial extent from the passed collection.
-     *
-     * @param collection
-     *            the collection containing the extent to parse, never <code>null</code>
-     * @return the parsed bbox, <code>null</code> if no extent exists
-     * @throws IllegalArgumentException
-     *             if the number of items in the extent invalid
-     *
-     */
-    public static BBox parseSpatialExtent( Map<String, Object> collection ) {
-        Object extent = collection.get( "extent" );
-        if ( extent == null || !( extent instanceof Map ) )
-            return null;
-        Object spatial = ( (Map<String, Object>) extent ).get( "spatial" );
-        if ( spatial == null || !( spatial instanceof List ) )
-            return null;
-        List<Object> coords = (List<Object>) spatial;
-        if ( coords.size() == 4 ) {
-            double minX = parseValueAsDouble( coords.get( 0 ) );
-            double minY = parseValueAsDouble( coords.get( 1 ) );
-            double maxX = parseValueAsDouble( coords.get( 2 ) );
-            double maxY = parseValueAsDouble( coords.get( 3 ) );
-            return new BBox( minX, minY, maxX, maxY );
-        } else if ( coords.size() == 6 ) {
-            throw new IllegalArgumentException( "BBox with " + coords.size()
-                                                + " coordinates is currently not supported" );
-        }
-        throw new IllegalArgumentException( "BBox with " + coords.size() + " coordinates is invalid" );
-    }
-
-    /**
-     * Parses all links with 'type' of one of the passed mediaTypes and the 'rel' property with the passed value.
-     *
-     * @param links
-     *            list of all links, never <code>null</code>
-     * @param mediaTypesToSupport
-     *            a list of media types the links searched for should support, may be empty but never <code>null</code>
-     * @param expectedRel
-     *            the expected value of the property 'rel', never <code>null</code>
-     * @return a list of links supporting one of the media types and with the expected 'rel' property, may be empty but
-     *         never <code>null</code>
-     */
-    public static List<Map<String, Object>> findLinksWithSupportedMediaTypeByRel( List<Map<String, Object>> links,
-                                                                                  List<String> mediaTypesToSupport,
-                                                                                  String expectedRel ) {
-        List<Map<String, Object>> alternateLinks = new ArrayList<>();
-        for ( Map<String, Object> link : links ) {
-            Object type = link.get( "type" );
-            Object rel = link.get( "rel" );
-            if ( expectedRel.equals( rel ) && isSupportedMediaType( type, mediaTypesToSupport ) )
-                alternateLinks.add( link );
-        }
-        return alternateLinks;
-    }
-
-    /**
-     * Parsing the media types which does not have a link woth property 'type' for.
-     *
-     * @param links
-     *            list of links to search in, never <code>null</code>
-     * @param mediaTypesToSuppport
-     *            a list of media types which should be supported, never <code>null</code>
-     * @return the media types which does not have a link for.
-     */
-    public static List<String> findUnsupportedTypes( List<Map<String, Object>> links, List<String> mediaTypesToSuppport ) {
-        List<String> unsupportedType = new ArrayList<>();
-        for ( String contentMediaType : mediaTypesToSuppport ) {
-            boolean hasLinkForContentType = hasLinkForContentType( links, contentMediaType );
-            if ( !hasLinkForContentType )
-                unsupportedType.add( contentMediaType );
-        }
-        return unsupportedType;
-    }
-
-    /**
-     * Parses the links without 'rel' or 'type' property.
-     * 
-     * @param links
-     *            list of links to search in, never <code>null</code>
-     * @param rels
-     *            rels <code>null</code>            
-     * @return the links without 'rel' or 'type' property
-     */
-    public static List<String> findLinksWithoutRelOrType( List<Map<String, Object>> links, Set<String> rels ) {
-        List<String> linksWithoutRelOrType = new ArrayList<>();
-        for ( Map<String, Object> link : links ) {
-            if ( rels.contains(link.get( "rel" )) && !linkIncludesRelAndType( link ) )
-                linksWithoutRelOrType.add( (String) link.get( "href" ) );
-        }
-        return linksWithoutRelOrType;
-    }
-
-    /**
-     * Parses the link with 'rel=self'.
-     *
-     * @param links
-     *            list of links to search in, never <code>null</code>
-     * @param expectedRel
-     *            the expected value of the property 'rel', never <code>null</code>
-     * @return the link to itself or <code>null</code> if no such link exists
-     */
-    public static Map<String, Object> findLinkByRel( List<Map<String, Object>> links, String expectedRel ) {
-        if ( links == null )
-            return null;
-        for ( Map<String, Object> link : links ) {
-            Object rel = link.get( "rel" );
-            if ( expectedRel.equals( rel ) )
-                return link;
-        }
-        return null;
-    }
-
-    /**
-     * Checks if the passed link contains 'rel' and 'type' properties.
-     * 
-     * @param link
-     *            to check, never <code>null</code>
-     * @return <code>true</code> if the link contains 'rel' and 'type' properties, <code>false</code> otherwise
-     */
-    public static boolean linkIncludesRelAndType( Map<String, Object> link ) {
-        Object rel = link.get( "rel" );
-        Object type = link.get( "type" );
-        if ( rel != null && type != null )
-            return true;
-        return false;
-    }
-
-    /**
-     * Checks if a property with the passed name exists in the jsonPath.
-     * 
-     * @param propertyName
-     *            name of the property to check, never <code>null</code>
-     * @param jsonPath
-     *            to check, never <code>null</code>
-     * @return <code>true</code> if the property exists, <code>false</code> otherwise
-     */
-    public static boolean hasProperty( String propertyName, JsonPath jsonPath ) {
-        return jsonPath.get( propertyName ) != null;
-    }
-
-    /**
-     * Collects the number of all returned features by iterating over all 'next' links and summarizing the size of
-     * features in 'features' array property.
-     * 
-     * @param jsonPath
-     *            the initial collection, never <code>null</code>
-     * @param maximumLimit
-     *            the limit parameter value to use, if &lt;= 0 the parameter is omitted
-     * @return the number of all returned features
-     * @throws URISyntaxException
-     *             if the creation of a uri fails
-     */
-    public static int collectNumberOfAllReturnedFeatures( JsonPath jsonPath, int maximumLimit )
-                            throws URISyntaxException {
-        int numberOfAllReturnedFeatures = jsonPath.getList( "features" ).size();
-        Map<String, Object> nextLink = findLinkByRel( jsonPath.getList( "links" ), "next" );
-        while ( nextLink != null ) {
-            String nextUrl = (String) nextLink.get( "href" );
-            URI uri = new URI( nextUrl );
-
-            RequestSpecification accept = given().log().all().baseUri( nextUrl ).accept( GEOJSON_MIME_TYPE );
-            String[] pairs = uri.getQuery().split( "&" );
-            String limitParamFromUri = null;
-            for ( String pair : pairs ) {
-                int idx = pair.indexOf( "=" );
-                String key = pair.substring( 0, idx );
-                String value = pair.substring( idx + 1 );
-                if ( "limit".equals( key ) ) {
-                    limitParamFromUri = value;
-                } else {
-                    accept.param( key, value );
-                }
-            }
-            if ( maximumLimit > 0 ) {
-                accept.param( "limit", maximumLimit );
-            } else if ( limitParamFromUri != null ) {
-                accept.param( "limit", limitParamFromUri );
-            }
-
-            Response response = accept.when().request( GET );
-            response.then().statusCode( 200 );
-
-            JsonPath nextJsonPath = response.jsonPath();
-            int features = nextJsonPath.getList( "features" ).size();
-            if ( features > 0 ) {
-                numberOfAllReturnedFeatures += features;
-                nextLink = findLinkByRel( nextJsonPath.getList( "links" ), "next" );
-            } else {
-                nextLink = null;
-            }
-        }
-        return numberOfAllReturnedFeatures;
-    }
-    
-    /**
-     * Converts an inputstream to String using UTF-8 encoding.
-     * 
-     * @param inputStream the inputstream
-     * @return the content of the inputstream as String
-     * @throws IOException if an I/O error occurs
-     */
-    public static String inputStreamToString(InputStream inputStream) throws IOException {
-        StringWriter writer = new StringWriter();
-        String encoding = StandardCharsets.UTF_8.name();
-        IOUtils.copy(inputStream, writer, encoding);
-        return prettifyString(writer.toString());
-    }
-
-    public static String prettifyString(String string) {
-        ObjectMapper objectMapper = getObjectMapper();
-        try {
-            Object jsonObject = objectMapper.readValue(string, Object.class);
-            String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject);
-            return prettyJson;
-        } catch (Exception e) {
-            //String was not JSON
-            return string;
-        }
-    }
-
-    private static ObjectMapper getObjectMapper() {
-        if(objectMapper == null) {
-            objectMapper = new ObjectMapper();
-        }
-        return objectMapper;
-    }
-
-    private static boolean isSameMediaType( String mediaType1, String mediaType2 ) {
-        if ( mediaType1.contains(";") || mediaType2.contains(";") ) {
-            // media types are not case sensitive
-            String[] components1 = mediaType1.toLowerCase().split(";");
-            String[] components2 = mediaType2.toLowerCase().split(";");
-            // type and subtype must match
-            if ( !components1[0].trim().equals(components2[0].trim()) )
-                return false;
-            Set<String> parameters1 = new HashSet<>();
-            Set<String> parameters2 = new HashSet<>();
-            // normalize parameter values and compare them
-            for ( int i=1; i<components1.length; i++ ) {
-                String parameter = components1[i].trim().replace("\"","");
-                if (!parameter.isEmpty())
-                    parameters1.add(parameter);
-            }
-            for ( int i=1; i<components2.length; i++ ) {
-                String parameter = components2[i].trim().replace("\"","");
-                if (!parameter.isEmpty())
-                    parameters2.add(parameter);
-            }
-            if ( parameters1.size() != parameters2.size() )
-                return false;
-            if ( !parameters1.containsAll(parameters2) )
-                return false;
-        } else if ( !mediaType1.trim().equalsIgnoreCase(mediaType2.trim()) )
-            return false;
-
-        return true;
-    }
-
-    private static boolean hasLinkForContentType( List<Map<String, Object>> alternateLinks, String mediaType ) {
-        for ( Map<String, Object> alternateLink : alternateLinks ) {
-            Object type = alternateLink.get( "type" );
-            if ( type instanceof String && isSameMediaType( mediaType, (String) type ) )
-                return true;
-        }
-        return false;
-    }
-
-    private static boolean isSupportedMediaType( Object type, List<String> mediaTypes ) {
-        for ( String mediaType : mediaTypes ) {
-            if ( type instanceof String && isSameMediaType( mediaType, (String) type ) )
-                return true;
-        }
-        return false;
-    }
-
-    private static double parseValueAsDouble( Object cords ) {
-        if ( cords instanceof Integer ) {
-            return ( (Integer) cords ).doubleValue();
-        } else if ( cords instanceof Float ) {
-            return ( (Float) cords ).doubleValue();
-        } else if ( cords instanceof Double ) {
-            return (Double) cords;
-        } else {
-            return Double.parseDouble( cords.toString() );
-        }
-    }
+	private static ObjectMapper objectMapper;
+
+	private JsonUtils() {
+	}
+
+	/**
+	 * Parses the id of the first feature from the passed json.
+	 * @param collectionItemJson the json document containing the features, never
+	 * <code>null</code>
+	 * @return the parsed id, may be <code>null</code> if no feature could be found
+	 */
+	public static String parseFeatureId(JsonPath collectionItemJson) {
+		List<Map<String, Object>> features = collectionItemJson.get("features");
+		if (features == null)
+			return null;
+		for (Map<String, Object> feature : features) {
+			if (feature.containsKey("id"))
+				return feature.get("id").toString();
+		}
+		return null;
+	}
+
+	/**
+	 * Parses the temporal extent from the passed collection.
+	 * @param collection the collection containing the extent to parse, never
+	 * <code>null</code>
+	 * @return the parsed temporal extent, <code>null</code> if no extent exists
+	 * @throws IllegalArgumentException if the number of items in the extent invalid
+	 *
+	 */
+	public static TemporalExtent parseTemporalExtent(Map<String, Object> collection) {
+		Object extent = collection.get("extent");
+		if (extent == null || !(extent instanceof Map))
+			return null;
+		Object spatial = ((Map<String, Object>) extent).get("temporal");
+		if (spatial == null || !(spatial instanceof List))
+			return null;
+		List<Object> coords = (List<Object>) spatial;
+		if (coords.size() == 2) {
+			ZonedDateTime begin = parseAsDate((String) coords.get(0));
+			ZonedDateTime end = parseAsDate((String) coords.get(1));
+			return new TemporalExtent(begin, end);
+		}
+		throw new IllegalArgumentException("Temporal extent with " + coords.size() + " items is invalid");
+	}
+
+	/**
+	 * Parses the passed string as ISO 8601 date.
+	 * @param dateTime the dateTime to parse, never <code>null</code>
+	 * @return the parsed date, never <code>null</code>
+	 */
+	public static ZonedDateTime parseAsDate(String dateTime) {
+		return ZonedDateTime.parse(dateTime);
+	}
+
+	/**
+	 * Formats the passed string as ISO 8601 date. Example: "2018-02-12T23:20:50Z"
+	 * @param dateTime the dateTime to format, never <code>null</code>
+	 * @return the formatted date, never <code>null</code>
+	 */
+	public static String formatDate(ZonedDateTime dateTime) {
+		return DateTimeFormatter.ISO_INSTANT.format(dateTime);
+	}
+
+	/**
+	 * Formats the passed string as ISO 8601 date. Example: "2018-02-12"
+	 * @param date the dateTime to format, never <code>null</code>
+	 * @return the formatted date, never <code>null</code>
+	 */
+	public static String formatDate(LocalDate date) {
+		return DateTimeFormatter.ISO_DATE.format(date);
+	}
+
+	/**
+	 * Formats the passed string as a period using a start and end time. Example:
+	 * "2018-02-12T00:00:00Z/2018-03-18T12:31:12Z"
+	 * @param beginDateTime the begin dateTime to format, never <code>null</code>
+	 * @param endDateTime the end dateTime to format, never <code>null</code>
+	 * @return the formatted date, never <code>null</code>
+	 */
+	public static String formatDateRange(ZonedDateTime beginDateTime, ZonedDateTime endDateTime) {
+		return formatDate(beginDateTime) + "/" + formatDate(endDateTime);
+	}
+
+	/**
+	 * Formats the passed string as a period using start time and a duration. Example:
+	 * "2018-02-12T00:00:00Z/P1M6DT12H31M12S"
+	 * @param beginDate the begin date to format, never <code>null</code>
+	 * @param endDate the end date to format, never <code>null</code>
+	 * @return the formatted date, never <code>null</code>
+	 */
+	public static String formatDateRangeWithDuration(LocalDate beginDate, LocalDate endDate) {
+		Period betweenDate = Period.between(beginDate, endDate);
+		return formatDate(beginDate) + "/" + betweenDate;
+	}
+
+	/**
+	 * Parses the spatial extent from the passed collection.
+	 * @param collection the collection containing the extent to parse, never
+	 * <code>null</code>
+	 * @return the parsed bbox, <code>null</code> if no extent exists
+	 * @throws IllegalArgumentException if the number of items in the extent invalid
+	 *
+	 */
+	public static BBox parseSpatialExtent(Map<String, Object> collection) {
+		Object extent = collection.get("extent");
+		if (extent == null || !(extent instanceof Map))
+			return null;
+		Object spatial = ((Map<String, Object>) extent).get("spatial");
+		if (spatial == null || !(spatial instanceof List))
+			return null;
+		List<Object> coords = (List<Object>) spatial;
+		if (coords.size() == 4) {
+			double minX = parseValueAsDouble(coords.get(0));
+			double minY = parseValueAsDouble(coords.get(1));
+			double maxX = parseValueAsDouble(coords.get(2));
+			double maxY = parseValueAsDouble(coords.get(3));
+			return new BBox(minX, minY, maxX, maxY);
+		}
+		else if (coords.size() == 6) {
+			throw new IllegalArgumentException(
+					"BBox with " + coords.size() + " coordinates is currently not supported");
+		}
+		throw new IllegalArgumentException("BBox with " + coords.size() + " coordinates is invalid");
+	}
+
+	/**
+	 * Parses all links with 'type' of one of the passed mediaTypes and the 'rel' property
+	 * with the passed value.
+	 * @param links list of all links, never <code>null</code>
+	 * @param mediaTypesToSupport a list of media types the links searched for should
+	 * support, may be empty but never <code>null</code>
+	 * @param expectedRel the expected value of the property 'rel', never
+	 * <code>null</code>
+	 * @return a list of links supporting one of the media types and with the expected
+	 * 'rel' property, may be empty but never <code>null</code>
+	 */
+	public static List<Map<String, Object>> findLinksWithSupportedMediaTypeByRel(List<Map<String, Object>> links,
+			List<String> mediaTypesToSupport, String expectedRel) {
+		List<Map<String, Object>> alternateLinks = new ArrayList<>();
+		for (Map<String, Object> link : links) {
+			Object type = link.get("type");
+			Object rel = link.get("rel");
+			if (expectedRel.equals(rel) && isSupportedMediaType(type, mediaTypesToSupport))
+				alternateLinks.add(link);
+		}
+		return alternateLinks;
+	}
+
+	/**
+	 * Parsing the media types which does not have a link woth property 'type' for.
+	 * @param links list of links to search in, never <code>null</code>
+	 * @param mediaTypesToSuppport a list of media types which should be supported, never
+	 * <code>null</code>
+	 * @return the media types which does not have a link for.
+	 */
+	public static List<String> findUnsupportedTypes(List<Map<String, Object>> links,
+			List<String> mediaTypesToSuppport) {
+		List<String> unsupportedType = new ArrayList<>();
+		for (String contentMediaType : mediaTypesToSuppport) {
+			boolean hasLinkForContentType = hasLinkForContentType(links, contentMediaType);
+			if (!hasLinkForContentType)
+				unsupportedType.add(contentMediaType);
+		}
+		return unsupportedType;
+	}
+
+	/**
+	 * Parses the links without 'rel' or 'type' property.
+	 * @param links list of links to search in, never <code>null</code>
+	 * @param rels rels <code>null</code>
+	 * @return the links without 'rel' or 'type' property
+	 */
+	public static List<String> findLinksWithoutRelOrType(List<Map<String, Object>> links, Set<String> rels) {
+		List<String> linksWithoutRelOrType = new ArrayList<>();
+		for (Map<String, Object> link : links) {
+			if (rels.contains(link.get("rel")) && !linkIncludesRelAndType(link))
+				linksWithoutRelOrType.add((String) link.get("href"));
+		}
+		return linksWithoutRelOrType;
+	}
+
+	/**
+	 * Parses the link with 'rel=self'.
+	 * @param links list of links to search in, never <code>null</code>
+	 * @param expectedRel the expected value of the property 'rel', never
+	 * <code>null</code>
+	 * @return the link to itself or <code>null</code> if no such link exists
+	 */
+	public static Map<String, Object> findLinkByRel(List<Map<String, Object>> links, String expectedRel) {
+		if (links == null)
+			return null;
+		for (Map<String, Object> link : links) {
+			Object rel = link.get("rel");
+			if (expectedRel.equals(rel))
+				return link;
+		}
+		return null;
+	}
+
+	/**
+	 * Checks if the passed link contains 'rel' and 'type' properties.
+	 * @param link to check, never <code>null</code>
+	 * @return <code>true</code> if the link contains 'rel' and 'type' properties,
+	 * <code>false</code> otherwise
+	 */
+	public static boolean linkIncludesRelAndType(Map<String, Object> link) {
+		Object rel = link.get("rel");
+		Object type = link.get("type");
+		if (rel != null && type != null)
+			return true;
+		return false;
+	}
+
+	/**
+	 * Checks if a property with the passed name exists in the jsonPath.
+	 * @param propertyName name of the property to check, never <code>null</code>
+	 * @param jsonPath to check, never <code>null</code>
+	 * @return <code>true</code> if the property exists, <code>false</code> otherwise
+	 */
+	public static boolean hasProperty(String propertyName, JsonPath jsonPath) {
+		return jsonPath.get(propertyName) != null;
+	}
+
+	/**
+	 * Collects the number of all returned features by iterating over all 'next' links and
+	 * summarizing the size of features in 'features' array property.
+	 * @param jsonPath the initial collection, never <code>null</code>
+	 * @param maximumLimit the limit parameter value to use, if &lt;= 0 the parameter is
+	 * omitted
+	 * @return the number of all returned features
+	 * @throws URISyntaxException if the creation of a uri fails
+	 */
+	public static int collectNumberOfAllReturnedFeatures(JsonPath jsonPath, int maximumLimit)
+			throws URISyntaxException {
+		int numberOfAllReturnedFeatures = jsonPath.getList("features").size();
+		Map<String, Object> nextLink = findLinkByRel(jsonPath.getList("links"), "next");
+		while (nextLink != null) {
+			String nextUrl = (String) nextLink.get("href");
+			URI uri = new URI(nextUrl);
+
+			RequestSpecification accept = given().log().all().baseUri(nextUrl).accept(GEOJSON_MIME_TYPE);
+			String[] pairs = uri.getQuery().split("&");
+			String limitParamFromUri = null;
+			for (String pair : pairs) {
+				int idx = pair.indexOf("=");
+				String key = pair.substring(0, idx);
+				String value = pair.substring(idx + 1);
+				if ("limit".equals(key)) {
+					limitParamFromUri = value;
+				}
+				else {
+					accept.param(key, value);
+				}
+			}
+			if (maximumLimit > 0) {
+				accept.param("limit", maximumLimit);
+			}
+			else if (limitParamFromUri != null) {
+				accept.param("limit", limitParamFromUri);
+			}
+
+			Response response = accept.when().request(GET);
+			response.then().statusCode(200);
+
+			JsonPath nextJsonPath = response.jsonPath();
+			int features = nextJsonPath.getList("features").size();
+			if (features > 0) {
+				numberOfAllReturnedFeatures += features;
+				nextLink = findLinkByRel(nextJsonPath.getList("links"), "next");
+			}
+			else {
+				nextLink = null;
+			}
+		}
+		return numberOfAllReturnedFeatures;
+	}
+
+	/**
+	 * Converts an inputstream to String using UTF-8 encoding.
+	 * @param inputStream the inputstream
+	 * @return the content of the inputstream as String
+	 * @throws IOException if an I/O error occurs
+	 */
+	public static String inputStreamToString(InputStream inputStream) throws IOException {
+		StringWriter writer = new StringWriter();
+		String encoding = StandardCharsets.UTF_8.name();
+		IOUtils.copy(inputStream, writer, encoding);
+		return prettifyString(writer.toString());
+	}
+
+	public static String prettifyString(String string) {
+		ObjectMapper objectMapper = getObjectMapper();
+		try {
+			Object jsonObject = objectMapper.readValue(string, Object.class);
+			String prettyJson = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject);
+			return prettyJson;
+		}
+		catch (Exception e) {
+			// String was not JSON
+			return string;
+		}
+	}
+
+	private static ObjectMapper getObjectMapper() {
+		if (objectMapper == null) {
+			objectMapper = new ObjectMapper();
+		}
+		return objectMapper;
+	}
+
+	private static boolean isSameMediaType(String mediaType1, String mediaType2) {
+		if (mediaType1.contains(";") || mediaType2.contains(";")) {
+			// media types are not case sensitive
+			String[] components1 = mediaType1.toLowerCase().split(";");
+			String[] components2 = mediaType2.toLowerCase().split(";");
+			// type and subtype must match
+			if (!components1[0].trim().equals(components2[0].trim()))
+				return false;
+			Set<String> parameters1 = new HashSet<>();
+			Set<String> parameters2 = new HashSet<>();
+			// normalize parameter values and compare them
+			for (int i = 1; i < components1.length; i++) {
+				String parameter = components1[i].trim().replace("\"", "");
+				if (!parameter.isEmpty())
+					parameters1.add(parameter);
+			}
+			for (int i = 1; i < components2.length; i++) {
+				String parameter = components2[i].trim().replace("\"", "");
+				if (!parameter.isEmpty())
+					parameters2.add(parameter);
+			}
+			if (parameters1.size() != parameters2.size())
+				return false;
+			if (!parameters1.containsAll(parameters2))
+				return false;
+		}
+		else if (!mediaType1.trim().equalsIgnoreCase(mediaType2.trim()))
+			return false;
+
+		return true;
+	}
+
+	private static boolean hasLinkForContentType(List<Map<String, Object>> alternateLinks, String mediaType) {
+		for (Map<String, Object> alternateLink : alternateLinks) {
+			Object type = alternateLink.get("type");
+			if (type instanceof String && isSameMediaType(mediaType, (String) type))
+				return true;
+		}
+		return false;
+	}
+
+	private static boolean isSupportedMediaType(Object type, List<String> mediaTypes) {
+		for (String mediaType : mediaTypes) {
+			if (type instanceof String && isSameMediaType(mediaType, (String) type))
+				return true;
+		}
+		return false;
+	}
+
+	private static double parseValueAsDouble(Object cords) {
+		if (cords instanceof Integer) {
+			return ((Integer) cords).doubleValue();
+		}
+		else if (cords instanceof Float) {
+			return ((Float) cords).doubleValue();
+		}
+		else if (cords instanceof Double) {
+			return (Double) cords;
+		}
+		else {
+			return Double.parseDouble(cords.toString());
+		}
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/NamespaceBindings.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/NamespaceBindings.java
index 6d6577b..fc56b16 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/NamespaceBindings.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/NamespaceBindings.java
@@ -10,96 +10,87 @@
 import org.opengis.cite.ogcapiprocesses10.Namespaces;
 
 /**
- * Provides namespace bindings for evaluating XPath 1.0 expressions using the
- * JAXP XPath API. A namespace name (URI) may be bound to only one prefix.
+ * Provides namespace bindings for evaluating XPath 1.0 expressions using the JAXP XPath
+ * API. A namespace name (URI) may be bound to only one prefix.
  */
 public class NamespaceBindings implements NamespaceContext {
 
-    private Map<String, String> bindings = new HashMap<String, String>();
+	private Map<String, String> bindings = new HashMap<String, String>();
 
-    @Override
-    public String getNamespaceURI(String prefix) {
-        String nsName = null;
-        for (Map.Entry<String, String> binding : bindings.entrySet()) {
-            if (binding.getValue().equals(prefix)) {
-                nsName = binding.getKey();
-                break;
-            }
-        }
-        return nsName;
-    }
+	@Override
+	public String getNamespaceURI(String prefix) {
+		String nsName = null;
+		for (Map.Entry<String, String> binding : bindings.entrySet()) {
+			if (binding.getValue().equals(prefix)) {
+				nsName = binding.getKey();
+				break;
+			}
+		}
+		return nsName;
+	}
 
-    @Override
-    public String getPrefix(String namespaceURI) {
-        return bindings.get(namespaceURI);
-    }
+	@Override
+	public String getPrefix(String namespaceURI) {
+		return bindings.get(namespaceURI);
+	}
 
-    @Override
-    public Iterator<String> getPrefixes(String namespaceURI) {
-        return Arrays.asList(getPrefix(namespaceURI)).iterator();
-    }
+	@Override
+	public Iterator<String> getPrefixes(String namespaceURI) {
+		return Arrays.asList(getPrefix(namespaceURI)).iterator();
+	}
 
-    /**
-     * Adds a namespace binding that associates a namespace name with a prefix.
-     * If a binding for a given namespace name already exists it will be
-     * replaced.
-     * 
-     * @param namespaceURI
-     *            A String denoting a namespace name (an absolute URI value).
-     * @param prefix
-     *            A prefix associated with the namespace name.
-     */
-    public void addNamespaceBinding(String namespaceURI, String prefix) {
-        bindings.put(namespaceURI, prefix);
-    }
+	/**
+	 * Adds a namespace binding that associates a namespace name with a prefix. If a
+	 * binding for a given namespace name already exists it will be replaced.
+	 * @param namespaceURI A String denoting a namespace name (an absolute URI value).
+	 * @param prefix A prefix associated with the namespace name.
+	 */
+	public void addNamespaceBinding(String namespaceURI, String prefix) {
+		bindings.put(namespaceURI, prefix);
+	}
 
-    /**
-     * Adds all of the supplied namespace bindings to the existing set of
-     * entries.
-     * 
-     * @param nsBindings
-     *            A Map containing a collection of namespace bindings where the
-     *            key is an absolute URI specifying the namespace name and the
-     *            value denotes the associated prefix.
-     */
-    public void addAllBindings(Map<String, String> nsBindings) {
-        if (null != nsBindings)
-            bindings.putAll(nsBindings);
-    }
+	/**
+	 * Adds all of the supplied namespace bindings to the existing set of entries.
+	 * @param nsBindings A Map containing a collection of namespace bindings where the key
+	 * is an absolute URI specifying the namespace name and the value denotes the
+	 * associated prefix.
+	 */
+	public void addAllBindings(Map<String, String> nsBindings) {
+		if (null != nsBindings)
+			bindings.putAll(nsBindings);
+	}
 
-    /**
-     * Returns an unmodifiable view of the declared namespace bindings.
-     * 
-     * @return An immutable Map containing zero or more namespace bindings where
-     *         the key is an absolute URI specifying the namespace name and the
-     *         value is the associated prefix.
-     */
-    public Map<String, String> getAllBindings() {
-        return Collections.unmodifiableMap(this.bindings);
-    }
+	/**
+	 * Returns an unmodifiable view of the declared namespace bindings.
+	 * @return An immutable Map containing zero or more namespace bindings where the key
+	 * is an absolute URI specifying the namespace name and the value is the associated
+	 * prefix.
+	 */
+	public Map<String, String> getAllBindings() {
+		return Collections.unmodifiableMap(this.bindings);
+	}
 
-    /**
-     * Creates a NamespaceBindings object that declares the following namespace
-     * bindings:
-     * 
-     * <ul>
-     * <li>ows: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#OWS}</li>
-     * <li>xlink: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#XLINK}</li>
-     * <li>gml: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#GML}</li>
-     * </ul>
-     * 
-     * @return A NamespaceBindings object.
-     */
-    public static NamespaceBindings withStandardBindings() {
-        NamespaceBindings nsBindings = new NamespaceBindings();
-        nsBindings.addNamespaceBinding(Namespaces.OWS, "ows");
-        nsBindings.addNamespaceBinding(Namespaces.XLINK, "xlink");
-        nsBindings.addNamespaceBinding(Namespaces.GML, "gml");
-        return nsBindings;
-    }
+	/**
+	 * Creates a NamespaceBindings object that declares the following namespace bindings:
+	 *
+	 * <ul>
+	 * <li>ows: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#OWS}</li>
+	 * <li>xlink: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#XLINK}</li>
+	 * <li>gml: {@value org.opengis.cite.ogcapiprocesses10.Namespaces#GML}</li>
+	 * </ul>
+	 * @return A NamespaceBindings object.
+	 */
+	public static NamespaceBindings withStandardBindings() {
+		NamespaceBindings nsBindings = new NamespaceBindings();
+		nsBindings.addNamespaceBinding(Namespaces.OWS, "ows");
+		nsBindings.addNamespaceBinding(Namespaces.XLINK, "xlink");
+		nsBindings.addNamespaceBinding(Namespaces.GML, "gml");
+		return nsBindings;
+	}
+
+	@Override
+	public String toString() {
+		return "NamespaceBindings:\n" + bindings;
+	}
 
-    @Override
-    public String toString() {
-        return "NamespaceBindings:\n" + bindings;
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/PathSettingRequest.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/PathSettingRequest.java
index 564a90b..ea71984 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/PathSettingRequest.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/PathSettingRequest.java
@@ -11,13 +11,20 @@
 import org.openapi4j.operation.validator.model.impl.Body;
 
 public class PathSettingRequest implements Request {
+
 	private final String url;
+
 	private final Method method;
+
 	private final String path;
+
 	private final Map<String, String> cookies;
-//	private final Map<String, Collection<String>> headers;
-    private final MultiStringMap<String> headers;
+
+	// private final Map<String, Collection<String>> headers;
+	private final MultiStringMap<String> headers;
+
 	private final String query;
+
 	private final Body body;
 
 	public PathSettingRequest(String url, String path, Method method) {
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TemporalExtent.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TemporalExtent.java
index e637da5..eb05bfa 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TemporalExtent.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TemporalExtent.java
@@ -7,21 +7,21 @@
  */
 public class TemporalExtent {
 
-    private ZonedDateTime begin;
+	private ZonedDateTime begin;
 
-    private ZonedDateTime end;
+	private ZonedDateTime end;
 
-    public TemporalExtent( ZonedDateTime begin, ZonedDateTime end ) {
-        this.begin = begin;
-        this.end = end;
-    }
+	public TemporalExtent(ZonedDateTime begin, ZonedDateTime end) {
+		this.begin = begin;
+		this.end = end;
+	}
 
-    public ZonedDateTime getBegin() {
-        return begin;
-    }
+	public ZonedDateTime getBegin() {
+		return begin;
+	}
 
-    public ZonedDateTime getEnd() {
-        return end;
-    }
+	public ZonedDateTime getEnd() {
+		return end;
+	}
 
 }
\ No newline at end of file
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TestSuiteLogger.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TestSuiteLogger.java
index 186962c..a4db6a6 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TestSuiteLogger.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/TestSuiteLogger.java
@@ -4,70 +4,65 @@
 import java.util.logging.Logger;
 
 /**
- * Logging utility class that provides simple access to the JDK Logging API. Set
- * the "java.util.logging.config.file" system property to specify the location
- * of the desired logging configuration file. A sample configuration file is
- * available at {@code src/main/config/logging.properties}.
+ * Logging utility class that provides simple access to the JDK Logging API. Set the
+ * "java.util.logging.config.file" system property to specify the location of the desired
+ * logging configuration file. A sample configuration file is available at
+ * {@code src/main/config/logging.properties}.
  *
  * @see java.util.logging.LogManager LogManager
  */
 public class TestSuiteLogger {
 
-    private static final Logger LOGR =
-            Logger.getLogger(TestSuiteLogger.class.getPackage().getName());
+	private static final Logger LOGR = Logger.getLogger(TestSuiteLogger.class.getPackage().getName());
 
-    /**
-     * Logs a message at the specified logging level with the given message
-     * parameters.
-     *
-     * @param level The logging {@link Level level}.
-     * @param message A String representing the content of the log message.
-     * @param params An array of message parameters.
-     */
-    public static void log(Level level, String message, Object[] params) {
-        if (LOGR.isLoggable(level)) {
-            LOGR.log(level, message, params);
-        }
-    }
+	/**
+	 * Logs a message at the specified logging level with the given message parameters.
+	 * @param level The logging {@link Level level}.
+	 * @param message A String representing the content of the log message.
+	 * @param params An array of message parameters.
+	 */
+	public static void log(Level level, String message, Object[] params) {
+		if (LOGR.isLoggable(level)) {
+			LOGR.log(level, message, params);
+		}
+	}
 
-    /**
-     * Logs a message at the specified logging level with the given Exception
-     * object that represents a noteworthy error condition.
-     *
-     * @param level The logging {@link Level level}.
-     * @param message A String representing the content of the log message.
-     * @param except An object that indicates an exceptional situation.
-     */
-    public static void log(Level level, String message, Exception except) {
-        if (LOGR.isLoggable(level)) {
-            LOGR.log(level, message, except);
-        }
-    }
+	/**
+	 * Logs a message at the specified logging level with the given Exception object that
+	 * represents a noteworthy error condition.
+	 * @param level The logging {@link Level level}.
+	 * @param message A String representing the content of the log message.
+	 * @param except An object that indicates an exceptional situation.
+	 */
+	public static void log(Level level, String message, Exception except) {
+		if (LOGR.isLoggable(level)) {
+			LOGR.log(level, message, except);
+		}
+	}
 
-    /**
-     * Logs a simple message at the specified logging level.
-     *
-     * @param level The logging {@link Level level}.
-     * @param message A String representing the content of the log message.
-     */
-    public static void log(Level level, String message) {
-        if (LOGR.isLoggable(level)) {
-            LOGR.log(level, message);
-        }
-    }
+	/**
+	 * Logs a simple message at the specified logging level.
+	 * @param level The logging {@link Level level}.
+	 * @param message A String representing the content of the log message.
+	 */
+	public static void log(Level level, String message) {
+		if (LOGR.isLoggable(level)) {
+			LOGR.log(level, message);
+		}
+	}
 
-    /**
-     * Indicates if the logger is enabled at a given logging level. Message
-     * levels lower than this value will be discarded.
-     *
-     * @param level The logging {@link Level level}.
-     * @return true if the logger is currently enabled for this logging level;
-     * false otherwise.
-     */
-    public static boolean isLoggable(Level level) {
-        return LOGR.isLoggable(level);
-    }
+	/**
+	 * Indicates if the logger is enabled at a given logging level. Message levels lower
+	 * than this value will be discarded.
+	 * @param level The logging {@link Level level}.
+	 * @return true if the logger is currently enabled for this logging level; false
+	 * otherwise.
+	 */
+	public static boolean isLoggable(Level level) {
+		return LOGR.isLoggable(level);
+	}
+
+	private TestSuiteLogger() {
+	}
 
-    private TestSuiteLogger() {
-    }
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/URIUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/URIUtils.java
index 2fab076..6ac5e16 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/URIUtils.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/URIUtils.java
@@ -19,47 +19,44 @@
  */
 public class URIUtils {
 
-    /**
-     * Dereferences the given URI and stores the resulting resource representation in a local file. The file will be
-     * located in the default temporary file directory.
-     * 
-     * @param uriRef
-     *            An absolute URI specifying the location of some resource.
-     * @return A File containing the content of the resource; it may be empty if resolution failed for any reason.
-     * @throws IOException
-     *             If an IO error occurred.
-     */
-    public static File dereferenceURI( URI uriRef )
-                            throws IOException {
-        if ( ( null == uriRef ) || !uriRef.isAbsolute() ) {
-            throw new IllegalArgumentException( "Absolute URI is required, but received " + uriRef );
-        }
-        if ( uriRef.getScheme().equalsIgnoreCase( "file" ) ) {
-            return new File( uriRef );
-        }
-        Client client = Client.create();
-        WebResource webRes = client.resource( uriRef );
-        ClientResponse rsp = webRes.get( ClientResponse.class );
-        String suffix = null;
-        if ( rsp.getHeaders().getFirst( HttpHeaders.CONTENT_TYPE ).endsWith( "xml" ) ) {
-            suffix = ".xml";
-        }
-        File destFile = File.createTempFile( "entity-", suffix );
-        if ( rsp.hasEntity() ) {
-            InputStream is = rsp.getEntityInputStream();
-            OutputStream os = new FileOutputStream( destFile );
-            byte[] buffer = new byte[8 * 1024];
-            int bytesRead;
-            while ( ( bytesRead = is.read( buffer ) ) != -1 ) {
-                os.write( buffer, 0, bytesRead );
-            }
-            is.close();
-            os.flush();
-            os.close();
-        }
-        TestSuiteLogger.log( Level.FINE,
-                             "Wrote " + destFile.length() + " bytes to file at " + destFile.getAbsolutePath() );
-        return destFile;
-    }
+	/**
+	 * Dereferences the given URI and stores the resulting resource representation in a
+	 * local file. The file will be located in the default temporary file directory.
+	 * @param uriRef An absolute URI specifying the location of some resource.
+	 * @return A File containing the content of the resource; it may be empty if
+	 * resolution failed for any reason.
+	 * @throws IOException If an IO error occurred.
+	 */
+	public static File dereferenceURI(URI uriRef) throws IOException {
+		if ((null == uriRef) || !uriRef.isAbsolute()) {
+			throw new IllegalArgumentException("Absolute URI is required, but received " + uriRef);
+		}
+		if (uriRef.getScheme().equalsIgnoreCase("file")) {
+			return new File(uriRef);
+		}
+		Client client = Client.create();
+		WebResource webRes = client.resource(uriRef);
+		ClientResponse rsp = webRes.get(ClientResponse.class);
+		String suffix = null;
+		if (rsp.getHeaders().getFirst(HttpHeaders.CONTENT_TYPE).endsWith("xml")) {
+			suffix = ".xml";
+		}
+		File destFile = File.createTempFile("entity-", suffix);
+		if (rsp.hasEntity()) {
+			InputStream is = rsp.getEntityInputStream();
+			OutputStream os = new FileOutputStream(destFile);
+			byte[] buffer = new byte[8 * 1024];
+			int bytesRead;
+			while ((bytesRead = is.read(buffer)) != -1) {
+				os.write(buffer, 0, bytesRead);
+			}
+			is.close();
+			os.flush();
+			os.close();
+		}
+		TestSuiteLogger.log(Level.FINE,
+				"Wrote " + destFile.length() + " bytes to file at " + destFile.getAbsolutePath());
+		return destFile;
+	}
 
 }
diff --git a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/XMLUtils.java b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/XMLUtils.java
index adc8f73..d577d38 100644
--- a/src/main/java/org/opengis/cite/ogcapiprocesses10/util/XMLUtils.java
+++ b/src/main/java/org/opengis/cite/ogcapiprocesses10/util/XMLUtils.java
@@ -19,32 +19,32 @@
  */
 public class XMLUtils {
 
-    /**
-     * Writes the content of a DOM Node to a string. The XML declaration is omitted and the character encoding is set to
-     * "US-ASCII" (any character outside of this set is serialized as a numeric character reference).
-     *
-     * @param node
-     *            The DOM Node to be serialized.
-     * @return A String representing the content of the given node.
-     */
-    public static String writeNodeToString( Node node ) {
-        if ( null == node ) {
-            return "";
-        }
-        Writer writer = null;
-        try {
-            Transformer idTransformer = TransformerFactory.newInstance().newTransformer();
-            Properties outProps = new Properties();
-            outProps.setProperty( OutputKeys.ENCODING, "US-ASCII" );
-            outProps.setProperty( OutputKeys.OMIT_XML_DECLARATION, "yes" );
-            outProps.setProperty( OutputKeys.INDENT, "yes" );
-            idTransformer.setOutputProperties( outProps );
-            writer = new StringWriter();
-            idTransformer.transform( new DOMSource( node ), new StreamResult( writer ) );
-        } catch ( TransformerException ex ) {
-            TestSuiteLogger.log( Level.WARNING, "Failed to serialize node " + node.getNodeName(), ex );
-        }
-        return writer.toString();
-    }
+	/**
+	 * Writes the content of a DOM Node to a string. The XML declaration is omitted and
+	 * the character encoding is set to "US-ASCII" (any character outside of this set is
+	 * serialized as a numeric character reference).
+	 * @param node The DOM Node to be serialized.
+	 * @return A String representing the content of the given node.
+	 */
+	public static String writeNodeToString(Node node) {
+		if (null == node) {
+			return "";
+		}
+		Writer writer = null;
+		try {
+			Transformer idTransformer = TransformerFactory.newInstance().newTransformer();
+			Properties outProps = new Properties();
+			outProps.setProperty(OutputKeys.ENCODING, "US-ASCII");
+			outProps.setProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+			outProps.setProperty(OutputKeys.INDENT, "yes");
+			idTransformer.setOutputProperties(outProps);
+			writer = new StringWriter();
+			idTransformer.transform(new DOMSource(node), new StreamResult(writer));
+		}
+		catch (TransformerException ex) {
+			TestSuiteLogger.log(Level.WARNING, "Failed to serialize node " + node.getNodeName(), ex);
+		}
+		return writer.toString();
+	}
 
 }
diff --git a/src/test/java/EtsAssertTest.java b/src/test/java/EtsAssertTest.java
index a43828c..2693ca6 100644
--- a/src/test/java/EtsAssertTest.java
+++ b/src/test/java/EtsAssertTest.java
@@ -6,25 +6,25 @@
  */
 public class EtsAssertTest {
 
-    @Test
-    public void testAssertTrue() {
-        EtsAssert.assertTrue( true, "OK" );
-    }
+	@Test
+	public void testAssertTrue() {
+		EtsAssert.assertTrue(true, "OK");
+	}
 
-    @Test
-    public void testAssertFalse() {
-        EtsAssert.assertFalse( false, "OK" );
-    }
+	@Test
+	public void testAssertFalse() {
+		EtsAssert.assertFalse(false, "OK");
+	}
 
-    @Test(expected = AssertionError.class)
-    public void testAssertTrue_false() {
-        EtsAssert.assertTrue( false, "FAIlURE" );
-    }
+	@Test(expected = AssertionError.class)
+	public void testAssertTrue_false() {
+		EtsAssert.assertTrue(false, "FAIlURE");
+	}
 
-    @Test(expected = AssertionError.class)
-    public void testAssertFalse_true() {
-        EtsAssert.assertFalse( true, "FAIlURE" );
+	@Test(expected = AssertionError.class)
+	public void testAssertFalse_true() {
+		EtsAssert.assertFalse(true, "FAIlURE");
 
-    }
+	}
 
 }