Switch from JUnit to TestNG.

Plus minor fixes.

88 files changed, 1168 insertions, 289 deletions

diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_12.xml b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
new file mode 100644
index 0000000..2b9ea17
--- /dev/null
+++ b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.beust:jcommander:1.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.12/jcommander-1.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_1.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_1.xml
new file mode 100644
index 0000000..c8360e5
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.fasterxml.jackson.core:jackson-core:2.2.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.2.1/jackson-core-2.2.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml
new file mode 100644
index 0000000..2b149c4
--- /dev/null
+++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_3.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_3.xml
new file mode 100644
index 0000000..ebd31e4
--- /dev/null
+++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-dbcp:commons-dbcp:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
new file mode 100644
index 0000000..66e6537
--- /dev/null
+++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-httpclient:commons-httpclient:3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
new file mode 100644
index 0000000..ed8bf5f
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_0.xml b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_0.xml
new file mode 100644
index 0000000..76b343e
--- /dev/null
+++ b/.idea/libraries/Maven__net_sf_opencsv_opencsv_2_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sf.opencsv:opencsv:2.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sf/opencsv/opencsv/2.0/opencsv-2.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_api_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_api_3_4_10.xml
new file mode 100644
index 0000000..6ea84f0
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_api_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-api:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-api/3.4.10/owlapi-api-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-api/3.4.10/owlapi-api-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-api/3.4.10/owlapi-api-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_apibinding_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_apibinding_3_4_10.xml
new file mode 100644
index 0000000..4a74a31
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_apibinding_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-apibinding:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-apibinding/3.4.10/owlapi-apibinding-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-apibinding/3.4.10/owlapi-apibinding-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-apibinding/3.4.10/owlapi-apibinding-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_contract_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_contract_3_4_10.xml
new file mode 100644
index 0000000..ff992a4
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_contract_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-contract:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-contract/3.4.10/owlapi-contract-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-contract/3.4.10/owlapi-contract-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-contract/3.4.10/owlapi-contract-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_distribution_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_distribution_3_4_10.xml
new file mode 100644
index 0000000..dbe2cb6
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_distribution_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-distribution:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-distribution/3.4.10/owlapi-distribution-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-distribution/3.4.10/owlapi-distribution-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-distribution/3.4.10/owlapi-distribution-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_impl_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_impl_3_4_10.xml
new file mode 100644
index 0000000..38600b6
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_impl_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-impl:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-impl/3.4.10/owlapi-impl-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-impl/3.4.10/owlapi-impl-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-impl/3.4.10/owlapi-impl-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_oboformat_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_oboformat_3_4_10.xml
new file mode 100644
index 0000000..b223003
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_oboformat_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-oboformat:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-oboformat/3.4.10/owlapi-oboformat-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-oboformat/3.4.10/owlapi-oboformat-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-oboformat/3.4.10/owlapi-oboformat-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_parsers_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_parsers_3_4_10.xml
new file mode 100644
index 0000000..1576413
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_parsers_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-parsers:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-parsers/3.4.10/owlapi-parsers-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-parsers/3.4.10/owlapi-parsers-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-parsers/3.4.10/owlapi-parsers-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_tools_3_4_10.xml b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_tools_3_4_10.xml
new file mode 100644
index 0000000..bf8a4d0
--- /dev/null
+++ b/.idea/libraries/Maven__net_sourceforge_owlapi_owlapi_tools_3_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: net.sourceforge.owlapi:owlapi-tools:3.4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-tools/3.4.10/owlapi-tools-3.4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-tools/3.4.10/owlapi-tools-3.4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/net/sourceforge/owlapi/owlapi-tools/3.4.10/owlapi-tools-3.4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
new file mode 100644
index 0000000..d6f17aa
--- /dev/null
+++ b/.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.beanshell:bsh:2.0b4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
new file mode 100644
index 0000000..acdf443
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_7_13.xml
new file mode 100644
index 0000000..dd22d4a
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_client_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-http-client:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-client/2.7.13/sesame-http-client-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-client/2.7.13/sesame-http-client-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-client/2.7.13/sesame-http-client-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_7_13.xml
new file mode 100644
index 0000000..7889ad6
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_http_protocol_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-http-protocol:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-protocol/2.7.13/sesame-http-protocol-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-protocol/2.7.13/sesame-http-protocol-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-http-protocol/2.7.13/sesame-http-protocol-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_7_13.xml
new file mode 100644
index 0000000..45725f9
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_model_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-model:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-model/2.7.13/sesame-model-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-model/2.7.13/sesame-model-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-model/2.7.13/sesame-model-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_7_13.xml
new file mode 100644
index 0000000..889e8b1
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_query_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-query:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-query/2.7.13/sesame-query-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-query/2.7.13/sesame-query-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-query/2.7.13/sesame-query-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_7_13.xml
new file mode 100644
index 0000000..eb57a1f
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_evaluation_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryalgebra-evaluation:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.7.13/sesame-queryalgebra-evaluation-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.7.13/sesame-queryalgebra-evaluation-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.7.13/sesame-queryalgebra-evaluation-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_7_13.xml
new file mode 100644
index 0000000..86a7dd0
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryalgebra_model_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryalgebra-model:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-model/2.7.13/sesame-queryalgebra-model-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-model/2.7.13/sesame-queryalgebra-model-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryalgebra-model/2.7.13/sesame-queryalgebra-model-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_7_13.xml
new file mode 100644
index 0000000..5ddfb00
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_api_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryparser-api:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-api/2.7.13/sesame-queryparser-api-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-api/2.7.13/sesame-queryparser-api-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-api/2.7.13/sesame-queryparser-api-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_7_13.xml
new file mode 100644
index 0000000..aa4ac65
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_serql_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryparser-serql:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-serql/2.7.13/sesame-queryparser-serql-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-serql/2.7.13/sesame-queryparser-serql-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-serql/2.7.13/sesame-queryparser-serql-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_sparql_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_sparql_2_7_13.xml
new file mode 100644
index 0000000..14cdd58
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryparser_sparql_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryparser-sparql:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-sparql/2.7.13/sesame-queryparser-sparql-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-sparql/2.7.13/sesame-queryparser-sparql-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryparser-sparql/2.7.13/sesame-queryparser-sparql-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_7_13.xml
new file mode 100644
index 0000000..b1b95c7
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_api_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryresultio-api:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-api/2.7.13/sesame-queryresultio-api-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-api/2.7.13/sesame-queryresultio-api-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-api/2.7.13/sesame-queryresultio-api-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_binary_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_binary_2_7_13.xml
new file mode 100644
index 0000000..cba13a3
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_binary_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryresultio-binary:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-binary/2.7.13/sesame-queryresultio-binary-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-binary/2.7.13/sesame-queryresultio-binary-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-binary/2.7.13/sesame-queryresultio-binary-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqljson_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqljson_2_7_13.xml
new file mode 100644
index 0000000..99e46ae
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqljson_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryresultio-sparqljson:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.7.13/sesame-queryresultio-sparqljson-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.7.13/sesame-queryresultio-sparqljson-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.7.13/sesame-queryresultio-sparqljson-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_7_13.xml
new file mode 100644
index 0000000..1424e8f
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_sparqlxml_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryresultio-sparqlxml:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.7.13/sesame-queryresultio-sparqlxml-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.7.13/sesame-queryresultio-sparqlxml-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.7.13/sesame-queryresultio-sparqlxml-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_text_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_text_2_7_13.xml
new file mode 100644
index 0000000..a60664a
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_queryresultio_text_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-queryresultio-text:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-text/2.7.13/sesame-queryresultio-text-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-text/2.7.13/sesame-queryresultio-text-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-queryresultio-text/2.7.13/sesame-queryresultio-text-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_7_13.xml
new file mode 100644
index 0000000..3898d28
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_api_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-api:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-api/2.7.13/sesame-repository-api-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-api/2.7.13/sesame-repository-api-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-api/2.7.13/sesame-repository-api-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_contextaware_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_contextaware_2_7_13.xml
new file mode 100644
index 0000000..ff88a73
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_contextaware_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-contextaware:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-contextaware/2.7.13/sesame-repository-contextaware-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-contextaware/2.7.13/sesame-repository-contextaware-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-contextaware/2.7.13/sesame-repository-contextaware-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_dataset_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_dataset_2_7_13.xml
new file mode 100644
index 0000000..e6a6616
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_dataset_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-dataset:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-dataset/2.7.13/sesame-repository-dataset-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-dataset/2.7.13/sesame-repository-dataset-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-dataset/2.7.13/sesame-repository-dataset-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_event_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_event_2_7_13.xml
new file mode 100644
index 0000000..15a5630
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_event_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-event:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-event/2.7.13/sesame-repository-event-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-event/2.7.13/sesame-repository-event-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-event/2.7.13/sesame-repository-event-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_http_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_http_2_7_13.xml
new file mode 100644
index 0000000..38165f2
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_http_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-http:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-http/2.7.13/sesame-repository-http-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-http/2.7.13/sesame-repository-http-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-http/2.7.13/sesame-repository-http-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_manager_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_manager_2_7_13.xml
new file mode 100644
index 0000000..cb9ecc6
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_manager_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-manager:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-manager/2.7.13/sesame-repository-manager-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-manager/2.7.13/sesame-repository-manager-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-manager/2.7.13/sesame-repository-manager-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_7_13.xml
new file mode 100644
index 0000000..0bdac86
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sail_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-sail:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sail/2.7.13/sesame-repository-sail-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sail/2.7.13/sesame-repository-sail-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sail/2.7.13/sesame-repository-sail-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_7_13.xml
new file mode 100644
index 0000000..bf6a5e1
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_repository_sparql_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-repository-sparql:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sparql/2.7.13/sesame-repository-sparql-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sparql/2.7.13/sesame-repository-sparql-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-repository-sparql/2.7.13/sesame-repository-sparql-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_7_13.xml
new file mode 100644
index 0000000..2db30bf
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_api_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-api:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-api/2.7.13/sesame-rio-api-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-api/2.7.13/sesame-rio-api-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-api/2.7.13/sesame-rio-api-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_binary_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_binary_2_7_13.xml
new file mode 100644
index 0000000..03c46cf
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_binary_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-binary:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-binary/2.7.13/sesame-rio-binary-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-binary/2.7.13/sesame-rio-binary-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-binary/2.7.13/sesame-rio-binary-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_datatypes_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_datatypes_2_7_13.xml
new file mode 100644
index 0000000..c5c5088
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_datatypes_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-datatypes:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-datatypes/2.7.13/sesame-rio-datatypes-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-datatypes/2.7.13/sesame-rio-datatypes-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-datatypes/2.7.13/sesame-rio-datatypes-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_languages_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_languages_2_7_13.xml
new file mode 100644
index 0000000..825799e
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_languages_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-languages:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-languages/2.7.13/sesame-rio-languages-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-languages/2.7.13/sesame-rio-languages-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-languages/2.7.13/sesame-rio-languages-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_n3_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_n3_2_7_13.xml
new file mode 100644
index 0000000..287d1c8
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_n3_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-n3:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-n3/2.7.13/sesame-rio-n3-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-n3/2.7.13/sesame-rio-n3-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-n3/2.7.13/sesame-rio-n3-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_nquads_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_nquads_2_7_13.xml
new file mode 100644
index 0000000..a6de600
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_nquads_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-nquads:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-nquads/2.7.13/sesame-rio-nquads-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-nquads/2.7.13/sesame-rio-nquads-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-nquads/2.7.13/sesame-rio-nquads-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_7_13.xml
new file mode 100644
index 0000000..4a2ef50
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_ntriples_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-ntriples:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-ntriples/2.7.13/sesame-rio-ntriples-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-ntriples/2.7.13/sesame-rio-ntriples-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-ntriples/2.7.13/sesame-rio-ntriples-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfjson_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfjson_2_7_13.xml
new file mode 100644
index 0000000..8a6d5a4
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfjson_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-rdfjson:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfjson/2.7.13/sesame-rio-rdfjson-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfjson/2.7.13/sesame-rio-rdfjson-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfjson/2.7.13/sesame-rio-rdfjson-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_7_13.xml
new file mode 100644
index 0000000..53bdb15
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_rdfxml_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-rdfxml:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfxml/2.7.13/sesame-rio-rdfxml-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfxml/2.7.13/sesame-rio-rdfxml-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-rdfxml/2.7.13/sesame-rio-rdfxml-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trig_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trig_2_7_13.xml
new file mode 100644
index 0000000..736a55d
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trig_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-trig:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trig/2.7.13/sesame-rio-trig-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trig/2.7.13/sesame-rio-trig-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trig/2.7.13/sesame-rio-trig-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_7_13.xml
new file mode 100644
index 0000000..8045595
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_trix_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-trix:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trix/2.7.13/sesame-rio-trix-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trix/2.7.13/sesame-rio-trix-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-trix/2.7.13/sesame-rio-trix-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_7_13.xml
new file mode 100644
index 0000000..857a710
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_rio_turtle_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-rio-turtle:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-turtle/2.7.13/sesame-rio-turtle-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-turtle/2.7.13/sesame-rio-turtle-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-rio-turtle/2.7.13/sesame-rio-turtle-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_runtime_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_runtime_2_7_13.xml
new file mode 100644
index 0000000..fbbc6ab
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_runtime_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-runtime:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-runtime/2.7.13/sesame-runtime-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-runtime/2.7.13/sesame-runtime-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-runtime/2.7.13/sesame-runtime-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_7_13.xml
new file mode 100644
index 0000000..e8ba5bc
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_api_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-api:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-api/2.7.13/sesame-sail-api-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-api/2.7.13/sesame-sail-api-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-api/2.7.13/sesame-sail-api-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_federation_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_federation_2_7_13.xml
new file mode 100644
index 0000000..9483bf5
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_federation_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-federation:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-federation/2.7.13/sesame-sail-federation-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-federation/2.7.13/sesame-sail-federation-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-federation/2.7.13/sesame-sail-federation-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_7_13.xml
new file mode 100644
index 0000000..4d09415
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_inferencer_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-inferencer:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-inferencer/2.7.13/sesame-sail-inferencer-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-inferencer/2.7.13/sesame-sail-inferencer-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-inferencer/2.7.13/sesame-sail-inferencer-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_7_13.xml
new file mode 100644
index 0000000..1bbe45c
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_memory_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-memory:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-memory/2.7.13/sesame-sail-memory-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-memory/2.7.13/sesame-sail-memory-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-memory/2.7.13/sesame-sail-memory-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_nativerdf_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_nativerdf_2_7_13.xml
new file mode 100644
index 0000000..da24cb2
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_nativerdf_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-nativerdf:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-nativerdf/2.7.13/sesame-sail-nativerdf-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-nativerdf/2.7.13/sesame-sail-nativerdf-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-nativerdf/2.7.13/sesame-sail-nativerdf-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_rdbms_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_rdbms_2_7_13.xml
new file mode 100644
index 0000000..b378c3f
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_sail_rdbms_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-sail-rdbms:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-rdbms/2.7.13/sesame-sail-rdbms-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-rdbms/2.7.13/sesame-sail-rdbms-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-sail-rdbms/2.7.13/sesame-sail-rdbms-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_7_13.xml b/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_7_13.xml
new file mode 100644
index 0000000..5c7b506
--- /dev/null
+++ b/.idea/libraries/Maven__org_openrdf_sesame_sesame_util_2_7_13.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.openrdf.sesame:sesame-util:2.7.13">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-util/2.7.13/sesame-util-2.7.13.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-util/2.7.13/sesame-util-2.7.13-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/openrdf/sesame/sesame-util/2.7.13/sesame-util-2.7.13-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
new file mode 100644
index 0000000..38036e9
--- /dev/null
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.6.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_testng_testng_6_7.xml b/.idea/libraries/Maven__org_testng_testng_6_7.xml
new file mode 100644
index 0000000..264ea06
--- /dev/null
+++ b/.idea/libraries/Maven__org_testng_testng_6_7.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.testng:testng:6.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.7/testng-6.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.7/testng-6.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.7/testng-6.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
new file mode 100644
index 0000000..0f8bd19
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.yaml:snakeyaml:1.6">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.6/snakeyaml-1.6-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/src/log4j.properties b/config/log4j.properties
index 25da4d4..25da4d4 100644
--- a/src/log4j.properties
+++ b/config/log4j.properties
diff --git a/config/test.properties b/config/test.properties
new file mode 100644
index 0000000..c4a25d0
--- /dev/null
+++ b/config/test.properties
@@ -0,0 +1 @@
+ontoDir=/home/alessandro/Big_files/Ontologies/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fad1545..096a14d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,12 @@
                         <version>2.7.13</version>
                 </dependency>
                 <dependency>
+                        <groupId>org.openrdf.sesame</groupId>
+                        <artifactId>sesame-rio-rdfxml</artifactId>
+                        <version>2.7.13</version>
+                        <scope>compile</scope>
+                </dependency>
+                <dependency>
                         <groupId>org.apache.jena</groupId>
                         <artifactId>jena-arq</artifactId>
                         <version>2.12.0</version>
@@ -97,5 +103,10 @@
                         <artifactId>jgrapht-jdk1.5</artifactId>
                         <version>0.7.3</version>
                 </dependency>
+                <dependency>
+                        <groupId>org.testng</groupId>
+                        <artifactId>testng</artifactId>
+                        <version>6.7</version>
+                </dependency>
         </dependencies>
 </project>
diff --git a/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java b/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
index f95ac12..f10b761 100644
--- a/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
+++ b/src/org/semanticweb/karma2/model/cqparser/ConjunctiveQueryWalker.java
@@ -67,7 +67,7 @@ public class ConjunctiveQueryWalker {
                 assert (prefixList.getType() == ConjunctiveQueryLexer.PREFIX_LIST);
                 Prefixes prefixes = walkPrefixList(prefixList);
                 CommonTree rulebody = iterator.next();
-                assert (prefixList.getType() == ConjunctiveQueryLexer.RULE);
+                assert (rulebody.getType() == ConjunctiveQueryLexer.RULE);
                 return walkRuleNode(rulebody, prefixes);
 
         }
diff --git a/src/uk/ac/ox/cs/pagoda/util/Utility.java b/src/uk/ac/ox/cs/pagoda/util/Utility.java
index cb05de4..7138ca9 100644
--- a/src/uk/ac/ox/cs/pagoda/util/Utility.java
+++ b/src/uk/ac/ox/cs/pagoda/util/Utility.java
@@ -10,6 +10,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;

 import java.io.OutputStreamWriter;

 import java.io.PrintStream;

+import java.nio.file.Files;

+import java.nio.file.Paths;

 import java.text.SimpleDateFormat;

 import java.time.LocalDateTime;

 import java.time.format.DateTimeFormatter;

@@ -24,9 +26,11 @@ import java.util.Stack;
 import org.apache.log4j.Logger;

 import org.semanticweb.HermiT.model.Atom;

 

+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;

+

 public class Utility {

         

-        private static final Logger LOGS = null; // Logger.getLogger(""); 

+        private static final Logger LOGS = Logger.getLogger("PAGOdA");

         

         public static final String JAVA_FILE_SEPARATOR = "/";

         public static final String FILE_SEPARATOR = System.getProperty("file.separator");

@@ -255,4 +259,14 @@ public class Utility {
                 return iri.replace(FILE_SEPARATOR, JAVA_FILE_SEPARATOR).replace(" ", "%20");

         }

 

+        public static String combinePaths(String path1, String path2) {

+                File file1 = new File(path1);

+                File file2 = new File(file1, path2);

+                return file2.getPath();

+        }

+

+        public static void copyFile(String src, String dst) throws IOException {

+                Files.copy(Paths.get(src), Paths.get(dst), REPLACE_EXISTING);

+        }

+

 }

diff --git a/target/.gitignore b/target/.gitignore
deleted file mode 100644
index 4569837..0000000
--- a/target/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/classes/
-/test-classes/
diff --git a/test/AllTests.xml b/test/AllTests.xml
new file mode 100644
index 0000000..8ce5fcf
--- /dev/null
+++ b/test/AllTests.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="AllTests">
+
+    <test name="PagodaUOBM">
+        <classes>
+            <class name="uk.ac.ox.cs.pagoda.test_units.PagodaUOBM" />
+        </classes>
+    </test>
+
+</suite>
\ No newline at end of file
diff --git a/test/FullEvaluation.xml b/test/FullEvaluation.xml
new file mode 100644
index 0000000..f0f047d
--- /dev/null
+++ b/test/FullEvaluation.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="AllTests">
+
+    <test name="LightEvaluation">
+        <classes>
+            <class name="uk.ac.ox.cs.pagoda.test_units.LightEvaluation" />
+        </classes>
+    </test>
+
+    <test name="CostEvaluation">
+        <classes>
+            <class name="uk.ac.ox.cs.pagoda.test_units.CostEvaluation" />
+        </classes>
+    </test>
+
+</suite>
\ No newline at end of file
diff --git a/test/uk/ac/ox/cs/pagoda/junit/AllTests.java b/test/uk/ac/ox/cs/pagoda/junit/AllTests.java
deleted file mode 100644
index fb38787..0000000
--- a/test/uk/ac/ox/cs/pagoda/junit/AllTests.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ PagodaUOBM.class
-        })
-public class AllTests {
-
-        public static void copy(String source, String dest) {
-            InputStream is = null;
-            OutputStream os = null;
-            try {
-                is = new FileInputStream(source);
-                os = new FileOutputStream(dest);
-                byte[] buffer = new byte[1024];
-                int length;
-                while ((length = is.read(buffer)) > 0) {
-                    os.write(buffer, 0, length);
-                }
-                is.close();
-                os.close();
-                
-                    BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(source))); 
-                    writer.write("");
-                    writer.close();
-            } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }       
-            
-//          File src = new File(source);
-//          src.delete(); 
-        }
-        
-}
diff --git a/test/uk/ac/ox/cs/pagoda/junit/FullEvaluation.java b/test/uk/ac/ox/cs/pagoda/junit/FullEvaluation.java
deleted file mode 100644
index 3406ed2..0000000
--- a/test/uk/ac/ox/cs/pagoda/junit/FullEvaluation.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({ LightEvaluation.class, 
-        CostEvaluation.class
-        })
-
-public class FullEvaluation {
-        
-}
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaLUBM.java b/test/uk/ac/ox/cs/pagoda/junit/PagodaLUBM.java
deleted file mode 100644
index f8fef0e..0000000
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaLUBM.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-
-import uk.ac.ox.cs.pagoda.tester.PagodaTester;
-import uk.ac.ox.cs.pagoda.tester.Statistics;
-
-public class PagodaLUBM {
-
-        public void test_all(int number) {
-                PagodaTester.main(
-                                PagodaTester.onto_dir + "lubm/univ-bench.owl",
-                                PagodaTester.onto_dir + "lubm/data/lubm" + number + ".ttl",
-                                PagodaTester.onto_dir + "lubm/queries/test_all_pagoda.sparql" 
-                ); 
-                
-                AllTests.copy("log4j.log", "output/jair/lubm" + number + ".out"); 
-        }
-        
-        @Test
-        public void test1() { test_all(1); }
-        
-        public void test() {
-                int number = 100;
-                test_all(number); 
-        }
-        
-        public void check(int number) {
-                Statistics stat = new Statistics("output/log4j.log");
-                String diff = stat.diff("results-backup/benchmark/lubm" + number + ".out"); 
-                AllTests.copy("output/log4j.log", "results-backup/current/lubm" + number + ".out"); 
-                if (!diff.isEmpty()) 
-                        fail(diff);
-        }
-        
-}
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/junit/PagodaUOBM.java
deleted file mode 100644
index 5b56c6d..0000000
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaUOBM.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import org.junit.Test;
-
-import uk.ac.ox.cs.pagoda.tester.PagodaTester;
-import uk.ac.ox.cs.pagoda.tester.Statistics;
-
-public class PagodaUOBM {
-
-        public void test_all(int number ) {
-                PagodaTester.main(
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_all_pagoda.sparql" 
-//                              PagodaTester.onto_dir + "uobm/queries/standard_group3_all_less.sparql;" + 
-//                              PagodaTester.onto_dir + "uobm/queries/G3.sparql;" +
-//                              PagodaTester.onto_dir + "uobm/queries/last.sparql" 
-                ); 
-                
-                AllTests.copy("log4j.log", "output/jair/newuobm/uobm" + number + ".out"); 
-        }
-        
-        public void test_upToSum(int number) {
-                PagodaTester.main(
-                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
-                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_group3_all.sparql" 
-                ); 
-                
-//              AllTests.copy("log4j.log", "output/jair/uobm" + number + ".out"); 
-        }
-        
-        @Test
-        public void test1() {   test_all(1); }
-        
-        public void test500() { test_upToSum(500); }
-        
-        public static void main(String... args) {
-                new PagodaUOBM().test_all(1); 
-        }
-        
-        public void check() {
-                Statistics stat = new Statistics("results-backup/current/uobm1.out"); 
-                String diff = stat.diff("results-backup/benchmark/uobm1.out"); 
-                System.out.println(diff); 
-        }
-        
-}
diff --git a/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java b/test/uk/ac/ox/cs/pagoda/test_units/ClauseTester.java
index d23f186..a0f16d4 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/ClauseTester.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/ClauseTester.java
@@ -1,8 +1,5 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
-import static org.junit.Assert.*;
-
-import org.junit.Test;
 import org.semanticweb.HermiT.model.Atom;
 import org.semanticweb.HermiT.model.AtomicConcept;
 import org.semanticweb.HermiT.model.AtomicRole;
@@ -13,6 +10,8 @@ import org.semanticweb.owlapi.apibinding.OWLManager;
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyManager;
 
+import org.testng.Assert;
+import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.approx.Clause;
 import uk.ac.ox.cs.pagoda.approx.Clausifier;
 
@@ -39,7 +38,7 @@ public class ClauseTester {
                         emptyOntology = m.createOntology(); 
                 } catch (Exception e) {
                         e.printStackTrace();
-                        fail("failed to create a new ontology"); 
+                        Assert.fail("failed to create a new ontology");
                 }
                 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
                 System.out.println(c.toString()); 
@@ -69,7 +68,7 @@ public class ClauseTester {
                         emptyOntology = m.createOntology(); 
                 } catch (Exception e) {
                         e.printStackTrace();
-                        fail("failed to create a new ontology"); 
+                        Assert.fail("failed to create a new ontology");
                 }
                 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
                 System.out.println(c.toString()); 
@@ -96,7 +95,7 @@ public class ClauseTester {
                         emptyOntology = m.createOntology(); 
                 } catch (Exception e) {
                         e.printStackTrace();
-                        fail("failed to create a new ontology"); 
+                        Assert.fail("failed to create a new ontology");
                 }
                 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
                 System.out.println(c.toString()); 
@@ -126,7 +125,7 @@ public class ClauseTester {
                         emptyOntology = m.createOntology(); 
                 } catch (Exception e) {
                         e.printStackTrace();
-                        fail("failed to create a new ontology"); 
+                        Assert.fail("failed to create a new ontology");
                 }
                 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
                 System.out.println(c.toString()); 
@@ -156,7 +155,7 @@ public class ClauseTester {
                         emptyOntology = m.createOntology(); 
                 } catch (Exception e) {
                         e.printStackTrace();
-                        fail("failed to create a new ontology"); 
+                        Assert.fail("failed to create a new ontology");
                 }
                 Clause c = new Clause(Clausifier.getInstance(emptyOntology), DLClause.create(headAtoms, bodyAtoms));
                 System.out.println(c.toString()); 
diff --git a/test/uk/ac/ox/cs/pagoda/junit/CostEvaluation.java b/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
index 87b01ed..4e32297 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/CostEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/CostEvaluation.java
@@ -1,8 +1,8 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
-import org.junit.Test;
 import org.semanticweb.owlapi.model.OWLOntology;
 
+import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.owl.OWLHelper;
 import uk.ac.ox.cs.pagoda.reasoner.QueryReasoner;
 import uk.ac.ox.cs.pagoda.reasoner.QueryReasoner.Type;
diff --git a/test/uk/ac/ox/cs/pagoda/junit/JAIR_PAGOdA.java b/test/uk/ac/ox/cs/pagoda/test_units/JAIR_PAGOdA.java
index 2a148cc..ff616f7 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/JAIR_PAGOdA.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/JAIR_PAGOdA.java
@@ -1,173 +1,180 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import org.junit.Test;
+package uk.ac.ox.cs.pagoda.test_units;
 
+import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class JAIR_PAGOdA {
 
-        public void lubm1() {
+        @Test
+        public void lubm1() throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "lubm/univ-bench.owl",
                                 PagodaTester.onto_dir + "lubm/data/lubm1.ttl",
                                 PagodaTester.onto_dir + "lubm/queries/test.sparql" 
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda");
         }
-        
-        
-        public void lubm1_conj() {
+
+        @Test
+        public void lubm1_conj() throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "lubm/univ-bench.owl",
                                 PagodaTester.onto_dir + "lubm/data/lubm1.ttl",
-                                PagodaTester.onto_dir + "lubm/queries/test_pellet.sparql" 
+                                PagodaTester.onto_dir + "lubm/queries/test_pellet.sparql"
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda_conj"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda_conj");
         }
-        
-        
-        public void lubm1_rolledUp() {
+
+        @Test
+        public void lubm1_rolledUp() throws IOException {
                 String[] args = new String[] {
                                 "/home/yzhou/backup/20141212/univ-bench-queries.owl",
                                 PagodaTester.onto_dir + "lubm/data/lubm1.ttl",
-                                PagodaTester.onto_dir + "lubm/queries/atomic_lubm.sparql" 
+                                PagodaTester.onto_dir + "lubm/queries/atomic_lubm.sparql"
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda_rolledUp"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/lubm1/pagoda_rolledUp");
         }
-        
-        
-        public void uobm1() {
+
+        @Test
+        public void uobm1() throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
                                 PagodaTester.onto_dir + "uobm/data/uobm1.ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard.sparql" 
+                                PagodaTester.onto_dir + "uobm/queries/standard.sparql"
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda");
         }
-        
-        
-        public void uobm1_conj() {
+
+        @Test
+        public void uobm1_conj() throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
                                 PagodaTester.onto_dir + "uobm/data/uobm1.ttl",
-                                PagodaTester.onto_dir + "uobm/queries/standard_pellet.sparql" 
+                                PagodaTester.onto_dir + "uobm/queries/standard_pellet.sparql"
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda_conj"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda_conj");
         }
 
-        
+        @Test
         public void uobm1_rolledUp() {
                 String[] args = new String[] {
                                 "/home/yzhou/backup/20141212/univ-bench-dl-queries.owl",
                                 PagodaTester.onto_dir + "uobm/data/uobm1.ttl",
-                                PagodaTester.onto_dir + "uobm/queries/atomic_uobm.sparql" 
+                                PagodaTester.onto_dir + "uobm/queries/atomic_uobm.sparql"
                 };
                 PagodaTester.main(args);
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda_rolledUp"); 
+//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uobm1/pagoda_rolledUp");
         }
-        
-        
+
+        @Test
         public void fly() {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl",
-                                null, 
-                                PagodaTester.onto_dir + "fly/queries/fly_pellet.sparql" 
+                                null,
+                                PagodaTester.onto_dir + "fly/queries/fly_pellet.sparql"
                 };
                 PagodaTester.main(args);
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda"); 
+//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda");
         }
-        
+
         @Test
-        public void fly_conj() {
+        public void fly_conj() throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl",
-                                null, 
-                                PagodaTester.onto_dir + "fly/queries/fly_pellet.sparql" 
+                                null,
+                                PagodaTester.onto_dir + "fly/queries/fly_pellet.sparql"
                 };
                 PagodaTester.main(args);
-                AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda_conj"); 
+                Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda_conj");
         }
-        
-        
+
+
         public void fly_rolledUp() {
                 PagodaTester.main(new String[] {
 //                              PagodaTester.onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl",
                                 PagodaTester.onto_dir + "fly/fly-all-in-one_rolledUp.owl",
-                                null, 
-                                PagodaTester.onto_dir + "fly/queries/fly_atomic.sparql" 
+                                null,
+                                PagodaTester.onto_dir + "fly/queries/fly_atomic.sparql"
                 });
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda_rolledUp"); 
+//              Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/fly/pagoda_rolledUp");
         }
-        
+
         public void dbpedia() {
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl", 
+                                PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl",
                                 PagodaTester.onto_dir + "dbpedia/data/dbpedia-minus-datatype-new.ttl",
                                 PagodaTester.onto_dir + "dbpedia/queries/atomic_ground.sparql"
                                 , "dbpedia.ans"
                 );
-                
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/dbpedia/pagoda"); 
+
+//              Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/dbpedia/pagoda");
         }
 
         public void npd() {
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "npd/npd-all-minus-datatype.owl", 
-                                PagodaTester.onto_dir + "npd/data/npd-data-dump-minus-datatype-new.ttl", 
+                                PagodaTester.onto_dir + "npd/npd-all-minus-datatype.owl",
+                                PagodaTester.onto_dir + "npd/data/npd-data-dump-minus-datatype-new.ttl",
                                 PagodaTester.onto_dir + "npd/queries/atomic_ground.sparql"
                                 , "npd.ans"
-                ); 
-                
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/npd/pagoda"); 
+                );
+
+//              Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/npd/pagoda");
         }
 
-        public void reactome() {
+        public void reactome() throws IOException {
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "bio2rdf/reactome/biopax-level3-processed.owl", 
+                                PagodaTester.onto_dir + "bio2rdf/reactome/biopax-level3-processed.owl",
                                 PagodaTester.onto_dir + "bio2rdf/reactome/graph sampling/reactome_sample_10.ttl",
-//                              null, 
+//                              null,
 //                              PagodaTester.onto_dir + "bio2rdf/reactome/queries/atomic_ground.sparql"
                                 PagodaTester.onto_dir + "bio2rdf/reactome/queries/example.sparql"
                                 , "pagoda_reactome.ans"
                 );
-                AllTests.copy("log4j.log", "output/jair/pagoda_reactome.example");
-                
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/reactome/pagoda_10p"); 
+                Utility.copyFile("log4j.log", "output/jair/pagoda_reactome.example");
+
+//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/reactome/pagoda_10p");
         }
-        
-        public void chembl() {
+
+        public void chembl() throws IOException {
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "bio2rdf/chembl/cco-noDPR.ttl", 
-                                PagodaTester.onto_dir + "bio2rdf/chembl/graph sampling/sample_1.nt", 
+                                PagodaTester.onto_dir + "bio2rdf/chembl/cco-noDPR.ttl",
+                                PagodaTester.onto_dir + "bio2rdf/chembl/graph sampling/sample_1.nt",
 //                              PagodaTester.onto_dir + "bio2rdf/chembl/queries/atomic_ground.sparql"
                                 PagodaTester.onto_dir + "bio2rdf/chembl/queries/example.sparql"
                                 , "pagoda_chembl.ans"
-                ); 
-                AllTests.copy("log4j.log", "output/jair/pagoda_chembl.example"); 
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/chembl/pagoda_1p"); 
+                );
+                Utility.copyFile("log4j.log", "output/jair/pagoda_chembl.example");
+//              Utility.copyFile("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/chembl/pagoda_1p");
         }
 
-        public void uniprot() {
+        public void uniprot() throws IOException {
                 PagodaTester.main(
-                                PagodaTester.onto_dir + "bio2rdf/uniprot/core-sat-processed.owl", 
+                                PagodaTester.onto_dir + "bio2rdf/uniprot/core-sat-processed.owl",
                                 PagodaTester.onto_dir + "bio2rdf/uniprot/graph sampling/sample_1.nt",
-//                              null, 
+//                              null,
 //                              PagodaTester.onto_dir + "bio2rdf/uniprot/queries/atomic_ground.sparql"
                                 PagodaTester.onto_dir + "bio2rdf/uniprot/queries/example.sparql"
                                 , "pagoda_uniprot.ans"
-                ); 
-                AllTests.copy("log4j.log", "output/jair/pagoda_uniprot.example"); 
-//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uniprot/pagoda_1p"); 
+                );
+                Utility.copyFile("log4j.log", "output/jair/pagoda_uniprot.example");
+//              AllTests.copy("output/log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uniprot/pagoda_1p");
         }
 
         
         public static void main(String... args) {
-                new JAIR_PAGOdA().fly();
+                try {
+                        new JAIR_PAGOdA().lubm1();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
         }
 
 }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/JAIR_Scalability.java b/test/uk/ac/ox/cs/pagoda/test_units/JAIR_Scalability.java
index 5e2b1d7..43cb810 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/JAIR_Scalability.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/JAIR_Scalability.java
@@ -1,30 +1,32 @@
-package uk.ac.ox.cs.pagoda.junit;
-
-import org.junit.Test;
+package uk.ac.ox.cs.pagoda.test_units;
 
+import org.testng.annotations.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
 import uk.ac.ox.cs.pagoda.util.Properties;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class JAIR_Scalability {
         
         private static final String date = "_0123"; 
 
         @Test
-        public void reactome() {
+        public void reactome() throws IOException {
                 testReactome(10, false);
         }
         
         @Test
-        public void chembl() {
+        public void chembl() throws IOException {
                 testChEMBL(1, false);
         }
 
         @Test
-        public void uniprot() {
+        public void uniprot() throws IOException {
                 testUniProt(1, false);
         }
 
-        public void testReactome(int percentage, boolean save) {
+        public void testReactome(int percentage, boolean save) throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "bio2rdf/reactome/biopax-level3-processed.owl", 
                                 PagodaTester.onto_dir + "bio2rdf/reactome/graph sampling/simplifed_sample_" + percentage + ".ttl", 
@@ -36,10 +38,10 @@ public class JAIR_Scalability {
                 
                 PagodaTester.main(args); 
                 if (save)
-                        AllTests.copy("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/reactome/pagoda_" + percentage + "p" + date); 
+                        Utility.copyFile("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/reactome/pagoda_" + percentage + "p" + date);
         }
         
-        public void testChEMBL(int percentage, boolean save) {
+        public void testChEMBL(int percentage, boolean save) throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "bio2rdf/chembl/cco-noDPR.ttl", 
                                 PagodaTester.onto_dir + "bio2rdf/chembl/sample_" + percentage + ".nt",
@@ -55,10 +57,10 @@ public class JAIR_Scalability {
                 
                 PagodaTester.main(args);
                 if (save)
-                AllTests.copy("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/chembl/pagoda_" + percentage + "p" + date); 
+                        Utility.copyFile("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/chembl/pagoda_" + percentage + "p" + date);
         }
         
-        public void testUniProt(int percentage, boolean save) {
+        public void testUniProt(int percentage, boolean save) throws IOException {
                 String[] args = new String[] {
                                 PagodaTester.onto_dir + "bio2rdf/uniprot/core-sat-processed.owl", 
                                 PagodaTester.onto_dir + "bio2rdf/uniprot/sample_" + percentage + ".nt",
@@ -75,10 +77,10 @@ public class JAIR_Scalability {
                 
                 PagodaTester.main(args); 
                 if (save)
-                        AllTests.copy("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uniprot/pagoda_" + percentage + "p" + date); 
+                        Utility.copyFile("log4j.log", "/home/yzhou/java-workspace/test-share/results_new/uniprot/pagoda_" + percentage + "p" + date);
         }
         
-        public static void main(String... args) {
+        public static void main(String... args) throws IOException {
                 Properties.ShellModeDefault = true; 
                 new JAIR_Scalability().testUniProt(50, false);
         }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/LightEvaluation.java b/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
index 1ddca15..29006de 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/LightEvaluation.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/LightEvaluation.java
@@ -1,59 +1,62 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class LightEvaluation {
 
         @Test
-        public void uobm1() {
+        public void uobm1() throws IOException {
                 int number = 1;
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
                                 PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
                                 PagodaTester.onto_dir + "uobm/queries/standard.sparql"
-                ); 
-                AllTests.copy("log4j.log", "output/jair/uobm1.out"); 
+                );
+                Utility.copyFile("log4j.log", "output/jair/uobm1.out");
         }
         
         @Test
-        public void lubm100() {
+        public void lubm100() throws IOException {
                 int number = 100;
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "lubm/univ-bench.owl",
                                 PagodaTester.onto_dir + "lubm/data/lubm" + number + ".ttl",
                                 PagodaTester.onto_dir + "lubm/queries/test.sparql"
-                ); 
-                AllTests.copy("log4j.log", "results-backup/current/lubm100.out"); 
+                );
+                Utility.copyFile("log4j.log", "results-backup/current/lubm100.out");
         }
         
         @Test
-        public void fly() {
+        public void fly() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl",
                                 PagodaTester.onto_dir + "fly/queries/fly.sparql" 
-                ); 
-                AllTests.copy("log4j.log", "results-backup/current/fly.out"); 
+                );
+                Utility.copyFile("log4j.log", "results-backup/current/fly.out");
         }
         
         @Test 
-        public void dbpedia() {
+        public void dbpedia() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl", 
                                 PagodaTester.onto_dir + "dbpedia/data/dbpedia-minus-datatype-new.ttl",
                                 PagodaTester.onto_dir + "dbpedia/atomic.sparql"
                 );
-                AllTests.copy("log4j.log", "results-backup/current/dbpedia.out"); 
+                Utility.copyFile("log4j.log", "results-backup/current/dbpedia.out");
         }
         
         @Test
-        public void npdWithoutDataType() {
+        public void npdWithoutDataType() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "npd/npd-all-minus-datatype.owl", 
                                 PagodaTester.onto_dir + "npd/data/npd-data-dump-minus-datatype-new.ttl", 
                                 PagodaTester.onto_dir + "npd/queries/atomic.sparql"
-                ); 
-                AllTests.copy("log4j.log", "results-backup/current/npd_minus.out"); 
+                );
+                Utility.copyFile("log4j.log", "results-backup/current/npd_minus.out");
         }
         
 }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaDBPedia.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaDBPedia.java
index 37ffb44..aaf542e 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaDBPedia.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaDBPedia.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import static org.junit.Assert.fail;
 
@@ -6,11 +6,14 @@ import org.junit.Test;
 
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
 import uk.ac.ox.cs.pagoda.tester.Statistics;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class PagodaDBPedia {
 
         @Test 
-        public void test() {
+        public void test() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "dbpedia/integratedOntology-all-in-one-minus-datatype.owl", 
                                 PagodaTester.onto_dir + "dbpedia/data/dbpedia-minus-datatype-new.ttl",
@@ -18,8 +21,8 @@ public class PagodaDBPedia {
                 );
                 
                 Statistics stat = new Statistics("output/log4j.log");
-                String diff = stat.diff("results-backup/benchmark/dbpedia.out"); 
-                AllTests.copy("output/log4j.log", "results-backup/current/dbpedia.out"); 
+                String diff = stat.diff("results-backup/benchmark/dbpedia.out");
+                Utility.copyFile("output/log4j.log", "results-backup/current/dbpedia.out");
                 if (!diff.isEmpty())
                         fail(diff);
         }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaELU.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaELU.java
index d999a6e..c2fa838 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaELU.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaELU.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaFLY.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaFLY.java
index 4631837..2fe07f0 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaFLY.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaFLY.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import org.junit.Test;
 
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
new file mode 100644
index 0000000..f40e41b
--- /dev/null
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaLUBM.java
@@ -0,0 +1,68 @@
+package uk.ac.ox.cs.pagoda.test_units;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.tester.Statistics;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+public class PagodaLUBM {
+
+        public static final String CONFIG_FILE = "config/test.properties";
+
+        private static boolean isInit = false;
+        private static String ontoDir;
+
+        private static void init() {
+                if(isInit) return;
+                isInit = true;
+
+                Properties config = new Properties();
+
+                try(FileInputStream in = new FileInputStream(CONFIG_FILE)) {
+                        config.load(in);
+                        in.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+
+                ontoDir = config.getProperty("ontoDir");
+        }
+
+        private void test_all(int number) {
+                init();
+                PagodaTester.main(
+                                Utility.combinePaths(ontoDir, "lubm/univ-bench.owl"),
+                                Utility.combinePaths(ontoDir, "lubm/data/lubm" + number + ".ttl"),
+                                Utility.combinePaths(ontoDir, "lubm/queries/test.sparql")
+                );
+
+//              assertTrue(false);
+//              AllTests.copy("log4j.log", "output/jair/lubm" + number + ".out");
+        }
+
+        @Test
+        public void test1() {
+                test_all(1);
+        }
+
+//      @Test
+//      public void test() {
+//              int number = 100;
+//              test_all(number);
+//      }
+        
+        private void check(int number) throws IOException {
+                Statistics stat = new Statistics("output/log4j.log");
+                // TODO insert proper file
+                String diff = stat.diff("results-backup/benchmark/lubm" + number + ".out");
+                Utility.copyFile("output/log4j.log", "results-backup/current/lubm" + number + ".out");
+                if (!diff.isEmpty())
+                        Assert.fail(diff);
+        }
+        
+}
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaNPD.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java
index 96edbb4..8fbe793 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaNPD.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import static org.junit.Assert.fail;
 
@@ -6,11 +6,14 @@ import org.junit.Test;
 
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
 import uk.ac.ox.cs.pagoda.tester.Statistics;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class PagodaNPD {
 
         @Test
-        public void testNPDwithoutDataType() {
+        public void testNPDwithoutDataType() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "npd/npd-all-minus-datatype.owl", 
                                 PagodaTester.onto_dir + "npd/data/npd-data-dump-minus-datatype-new.ttl", 
@@ -18,14 +21,14 @@ public class PagodaNPD {
                 ); 
                 
                 Statistics stat = new Statistics("output/log4j.log");
-                String diff = stat.diff("results-backup/benchmark/npd_minus.out"); 
-                AllTests.copy("output/log4j.log", "results-backup/current/npd_minus.out"); 
+                String diff = stat.diff("results-backup/benchmark/npd_minus.out");
+                Utility.copyFile("output/log4j.log", "results-backup/current/npd_minus.out");
                 if (!diff.isEmpty())
                         fail(diff);
         }
         
         @Test
-        public void testNPD() {
+        public void testNPD() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "npd/npd-all.owl", 
                                 PagodaTester.onto_dir + "npd/data/npd-data-dump-processed.ttl", 
@@ -33,8 +36,8 @@ public class PagodaNPD {
                 );
                 
                 Statistics stat = new Statistics("output/log4j.log");
-                String diff = stat.diff("results-backup/benchmark/npd.out"); 
-                AllTests.copy("output/log4j.log", "results-backup/current/npd.out"); 
+                String diff = stat.diff("results-backup/benchmark/npd.out");
+                Utility.copyFile("output/log4j.log", "results-backup/current/npd.out");
                 if (!diff.isEmpty())
                         fail(diff);
         }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaNPD_bench.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD_bench.java
index df1a57d..1243180 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaNPD_bench.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaNPD_bench.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import static org.junit.Assert.fail;
 
@@ -6,11 +6,14 @@ import org.junit.Test;
 
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
 import uk.ac.ox.cs.pagoda.tester.Statistics;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.IOException;
 
 public class PagodaNPD_bench {
         
         @Test
-        public void test() {
+        public void test() throws IOException {
                 PagodaTester.main(
                                 PagodaTester.onto_dir + "npd-benchmark/npd-v2-ql_a.owl", 
                                 PagodaTester.onto_dir + "npd-benchmark/npd-v2-ql_a.ttl", 
@@ -18,8 +21,8 @@ public class PagodaNPD_bench {
                 ); 
                 
                 Statistics stat = new Statistics("output/log4j.log");
-                String diff = stat.diff("results-backup/benchmark/npd-bench.out"); 
-                AllTests.copy("output/log4j.log", "results-backup/current/npd-bench.out"); 
+                String diff = stat.diff("results-backup/benchmark/npd-bench.out");
+                Utility.copyFile("output/log4j.log", "results-backup/current/npd-bench.out");
                 if (!diff.isEmpty())
                         fail(diff);
         }
diff --git a/test/uk/ac/ox/cs/pagoda/junit/PagodaRLU.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaRLU.java
index 5d93302..8b31c99 100644
--- a/test/uk/ac/ox/cs/pagoda/junit/PagodaRLU.java
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaRLU.java
@@ -1,4 +1,4 @@
-package uk.ac.ox.cs.pagoda.junit;
+package uk.ac.ox.cs.pagoda.test_units;
 
 import org.junit.Test;
 import uk.ac.ox.cs.pagoda.tester.PagodaTester;
diff --git a/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
new file mode 100644
index 0000000..29a9056
--- /dev/null
+++ b/test/uk/ac/ox/cs/pagoda/test_units/PagodaUOBM.java
@@ -0,0 +1,79 @@
+package uk.ac.ox.cs.pagoda.test_units;
+
+import org.testng.annotations.Test;
+import uk.ac.ox.cs.pagoda.tester.PagodaTester;
+import uk.ac.ox.cs.pagoda.tester.Statistics;
+import uk.ac.ox.cs.pagoda.util.Utility;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Properties;
+
+public class PagodaUOBM {
+
+        public static final String CONFIG_FILE = "config/test.properties";
+
+        private static boolean isInit = false;
+        private static String ontoDir;
+
+        private static void init() {
+                if(isInit) return;
+                isInit = true;
+
+                Properties config = new Properties();
+
+                try(FileInputStream in = new FileInputStream(CONFIG_FILE)) {
+                        config.load(in);
+                        in.close();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+
+                ontoDir = config.getProperty("ontoDir");
+        }
+
+        private void test_all(int number ) {
+                init();
+
+                PagodaTester.main(
+                                Utility.combinePaths(ontoDir, "uobm/univ-bench-dl.owl"),
+                                Utility.combinePaths(ontoDir, "uobm/data/uobm" + number + ".ttl"),
+                                Utility.combinePaths(ontoDir, "uobm/queries/test.sparql")
+//                              + ";" +
+//                              Utility.combinePaths(ontoDir, "uobm/queries/standard_group3_all_less.sparql") + ";" +
+//                              Utility.combinePaths(ontoDir, "uobm/queries/G3.sparql") + ";" +
+//                              Utility.combinePaths(ontoDir, "uobm/queries/last.sparql")
+                );
+
+//              AllTests.copy("log4j.log", "output/jair/newuobm/uobm" + number + ".out");
+        }
+        
+        private void test_upToSum(int number) {
+                init();
+
+                PagodaTester.main(
+                                PagodaTester.onto_dir + "uobm/univ-bench-dl.owl",
+                                PagodaTester.onto_dir + "uobm/data/uobm" + number + ".ttl",
+                                PagodaTester.onto_dir + "uobm/queries/standard_group3_all.sparql" 
+                ); 
+                
+//              AllTests.copy("log4j.log", "output/jair/uobm" + number + ".out"); 
+        }
+
+        @Test
+        public void test1() { test_all(1); }
+
+//      @Test
+        public void test500() { test_upToSum(500); }
+        
+//      public static void main(String... args) {
+//              new PagodaUOBM().test_all(1);
+//      }
+        
+        private void check() {
+                Statistics stat = new Statistics("results-backup/current/uobm1.out"); 
+                String diff = stat.diff("results-backup/benchmark/uobm1.out"); 
+                System.out.println(diff); 
+        }
+        
+}
diff --git a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
index 05a7d70..51b41f9 100644
--- a/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
+++ b/test/uk/ac/ox/cs/pagoda/tester/PagodaTester.java
@@ -17,7 +17,7 @@ public class PagodaTester {
 //      public static final String onto_dir = "/media/RDFData/yzhou/";
 //      public static final String onto_dir = "/users/yzhou/ontologies/";
 //      public static final String onto_dir = "/home/scratch/yzhou/ontologies/";
-        public static final String onto_dir = "/home/yzhou/krr-nas-share/Yujiao/ontologies/"; 
+        public static final String onto_dir = "/home/alessandro/Big_files/Ontologies/";
 
         public static final String fly = onto_dir + "fly/fly_anatomy_XP_with_GJ_FC_individuals.owl";
         public static final String fly_query = onto_dir + "fly/queries/fly.sparql";
@@ -88,12 +88,12 @@ public class PagodaTester {
         
         public static final String atlas_tbox = onto_dir + "bio2rdf/atlas/gxaterms.owl"; 
         public static final String atlas_abox = onto_dir + "bio2rdf/atlas/graph sampling/sample_1.nt"; 
-        public static final String atlas_queries = onto_dir + "bio2rdf/atlas/queries/atomic_one.sparql"; 
-        
+        public static final String atlas_queries = onto_dir + "bio2rdf/atlas/queries/atomic_one.sparql";
+
         public static void main(String... args) {
                 if (args.length == 0) {
 //                      args = new String[] {test_tbox, test_abox, test_query};
-//                      args = new String[] {lubm_tbox, lubm_abox, lubm_query.replace(".sparql", "_all_pagoda.sparql")}; 
+                        args = new String[] {lubm_tbox, lubm_abox, lubm_query};
 //                      args = new String[] {uobm_tbox, uobm_abox, uobm_query.replace(".sparql", "_all_pagoda.sparql")};
 //                      args = new String[] {fly, "null", fly_query.replace(".sparql", "_pellet.sparql") };
 //                      args = new String[] {dbpedia_tbox, dbpedia_abox, dbpedia_query};
@@ -129,10 +129,10 @@ public class PagodaTester {
                 if (args.length > index) properties.setToClassify(Boolean.parseBoolean(args[index++].substring(1)));   
                 if (args.length > index) properties.setToCallHermiT(Boolean.parseBoolean(args[index++].substring(1)));   
         
-                System.out.println("Ontology file: " + properties.getOntologyPath()); 
-                System.out.println("Data files: " + properties.getDataPath());  
-                System.out.println("Query files: " + properties.getQueryPath()); 
-                System.out.println("Answer file: " + properties.getAnswerPath());
+                Utility.logInfo("Ontology file: " + properties.getOntologyPath());
+                Utility.logInfo("Data files: " + properties.getDataPath());
+                Utility.logInfo("Query files: " + properties.getQueryPath());
+                Utility.logInfo("Answer file: " + properties.getAnswerPath());
                 
                 QueryReasoner pagoda = null;