diff --git a/registereditems/ogc-utils/iri-or-curie/schema.yaml b/registereditems/ogc-utils/iri-or-curie/schema.yaml
index df4d2cb8a..48e48fa55 100644
--- a/registereditems/ogc-utils/iri-or-curie/schema.yaml
+++ b/registereditems/ogc-utils/iri-or-curie/schema.yaml
@@ -3,13 +3,13 @@ description: IRI or CURIE
 $defs:
   IRI:
     type: string
-    pattern: '^\w+:(\/?\/?)[^\s]+$'
+    pattern: '^\w+:/*([^:<>{}|\\^`"\s/]+[^<>{}|\\^`"\s]*(:[^:<>{}|\\^`"\s]+)?)?$'
   CURIE:
     type: string
-    pattern: '^[A-Za-z_][^\s:]*:.*$'
+    pattern: '^[A-Za-z_][^\s:/]*:[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`" ]*)?(#[^<>{}|\\^`"\s]*)?$'
   LocalPart:
     type: string
-    pattern: '^[^:<>\{\}\|\\\^`" ]*(\?[^<>\{\}\|\\\^`" ]*)?(#[^<>\{\}\|\\\^`" ]*)?$'
+    pattern: '^[^:<>{}|\\^`"\s]*(\?[^<>{}|\\^`"\s]*)?(#[^<>{}|\\^`"\s]*)?$'
   Single:
     anyOf:
       - $ref: '#/$defs/IRI'
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/failing1-fail.json b/registereditems/ogc-utils/iri-or-curie/tests/failing1-fail.json
new file mode 100644
index 000000000..efd782cc3
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/failing1-fail.json
@@ -0,0 +1 @@
+" "
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/failing2-fail.json b/registereditems/ogc-utils/iri-or-curie/tests/failing2-fail.json
new file mode 100644
index 000000000..cd441b956
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/failing2-fail.json
@@ -0,0 +1 @@
+"https://www.google com/test"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/failing3-fail.json b/registereditems/ogc-utils/iri-or-curie/tests/failing3-fail.json
new file mode 100644
index 000000000..ff98dd3c4
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/failing3-fail.json
@@ -0,0 +1 @@
+"not an IRI"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test1.json b/registereditems/ogc-utils/iri-or-curie/tests/test1.json
new file mode 100644
index 000000000..99be1d415
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test1.json
@@ -0,0 +1 @@
+"file://foo"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test10.json b/registereditems/ogc-utils/iri-or-curie/tests/test10.json
new file mode 100644
index 000000000..f5a11ec28
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test10.json
@@ -0,0 +1 @@
+"http://example.com"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test11.json b/registereditems/ogc-utils/iri-or-curie/tests/test11.json
new file mode 100644
index 000000000..9da81dfa9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test11.json
@@ -0,0 +1 @@
+"http://example.com/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test12.json b/registereditems/ogc-utils/iri-or-curie/tests/test12.json
new file mode 100644
index 000000000..2ccfccf7a
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test12.json
@@ -0,0 +1 @@
+"http://example.com/foo"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test13.json b/registereditems/ogc-utils/iri-or-curie/tests/test13.json
new file mode 100644
index 000000000..de0ea1ed8
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test13.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test14.json b/registereditems/ogc-utils/iri-or-curie/tests/test14.json
new file mode 100644
index 000000000..c666bec2b
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test14.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test15.json b/registereditems/ogc-utils/iri-or-curie/tests/test15.json
new file mode 100644
index 000000000..0852b9d6c
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test15.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar?q=1&r=2"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test16.json b/registereditems/ogc-utils/iri-or-curie/tests/test16.json
new file mode 100644
index 000000000..2e0ac8d67
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test16.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar/?q=1&r=2"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test17.json b/registereditems/ogc-utils/iri-or-curie/tests/test17.json
new file mode 100644
index 000000000..38dd22789
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test17.json
@@ -0,0 +1 @@
+"http://example.com#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test18.json b/registereditems/ogc-utils/iri-or-curie/tests/test18.json
new file mode 100644
index 000000000..bbcd5eb04
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test18.json
@@ -0,0 +1 @@
+"http://example.com/#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test19.json b/registereditems/ogc-utils/iri-or-curie/tests/test19.json
new file mode 100644
index 000000000..d894e4ad5
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test19.json
@@ -0,0 +1 @@
+"http://example.com/foo#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test2.json b/registereditems/ogc-utils/iri-or-curie/tests/test2.json
new file mode 100644
index 000000000..4187b90a6
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test2.json
@@ -0,0 +1 @@
+"ftp://ftp.is.co.za/rfc/rfc1808.txt"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test20.json b/registereditems/ogc-utils/iri-or-curie/tests/test20.json
new file mode 100644
index 000000000..3b3f67ba2
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test20.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test21.json b/registereditems/ogc-utils/iri-or-curie/tests/test21.json
new file mode 100644
index 000000000..c19592647
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test21.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar/#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test22.json b/registereditems/ogc-utils/iri-or-curie/tests/test22.json
new file mode 100644
index 000000000..68460b9c7
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test22.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar?q=1&r=2#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test23.json b/registereditems/ogc-utils/iri-or-curie/tests/test23.json
new file mode 100644
index 000000000..62fda4e10
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test23.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar/?q=1&r=2#toto"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test24.json b/registereditems/ogc-utils/iri-or-curie/tests/test24.json
new file mode 100644
index 000000000..20f745e11
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test24.json
@@ -0,0 +1 @@
+"http://example.com/foo/bar/.././baz"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test25.json b/registereditems/ogc-utils/iri-or-curie/tests/test25.json
new file mode 100644
index 000000000..7d10165cd
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test25.json
@@ -0,0 +1 @@
+"http://a.example/AZazÀÖØöø˿ͰͽͿ῿"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test26.json b/registereditems/ogc-utils/iri-or-curie/tests/test26.json
new file mode 100644
index 000000000..f58122404
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test26.json
@@ -0,0 +1 @@
+"http://a.example/‌‍⁰↏Ⰰ⿯、퟿﨎﷏"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test27.json b/registereditems/ogc-utils/iri-or-curie/tests/test27.json
new file mode 100644
index 000000000..49f064394
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test27.json
@@ -0,0 +1 @@
+"http://a.example/ﷰ￯𐀀󯿽"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test28.json b/registereditems/ogc-utils/iri-or-curie/tests/test28.json
new file mode 100644
index 000000000..af71c5062
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test28.json
@@ -0,0 +1 @@
+"http://a.example/?AZaz󰀀󿿽􀀀􏿽ÀÖØ"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test29.json b/registereditems/ogc-utils/iri-or-curie/tests/test29.json
new file mode 100644
index 000000000..64d58fd69
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test29.json
@@ -0,0 +1 @@
+"http://a.example/öø˿ͰͽͿ῿‌‍⁰↏Ⰰ"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test3.json b/registereditems/ogc-utils/iri-or-curie/tests/test3.json
new file mode 100644
index 000000000..28995ddd9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test3.json
@@ -0,0 +1 @@
+"http://www.ietf.org/rfc/rfc2396.txt"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test30.json b/registereditems/ogc-utils/iri-or-curie/tests/test30.json
new file mode 100644
index 000000000..f33fb5fe5
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test30.json
@@ -0,0 +1 @@
+"http://a.example/⿯、퟿﨎﷏ﷰ￯𐀀󯿽"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test31.json b/registereditems/ogc-utils/iri-or-curie/tests/test31.json
new file mode 100644
index 000000000..3c4991a44
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test31.json
@@ -0,0 +1 @@
+"file:///foo/bar"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test32.json b/registereditems/ogc-utils/iri-or-curie/tests/test32.json
new file mode 100644
index 000000000..a2161916c
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test32.json
@@ -0,0 +1 @@
+"mailto:user@host?subject=blah"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test33.json b/registereditems/ogc-utils/iri-or-curie/tests/test33.json
new file mode 100644
index 000000000..9092d04db
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test33.json
@@ -0,0 +1 @@
+"dav:"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test34.json b/registereditems/ogc-utils/iri-or-curie/tests/test34.json
new file mode 100644
index 000000000..75937e6f9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test34.json
@@ -0,0 +1 @@
+"about:"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test35.json b/registereditems/ogc-utils/iri-or-curie/tests/test35.json
new file mode 100644
index 000000000..c8fafe172
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test35.json
@@ -0,0 +1 @@
+"http://www.yahoo.com"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test36.json b/registereditems/ogc-utils/iri-or-curie/tests/test36.json
new file mode 100644
index 000000000..1339f3e8f
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test36.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test37.json b/registereditems/ogc-utils/iri-or-curie/tests/test37.json
new file mode 100644
index 000000000..79d02aff5
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test37.json
@@ -0,0 +1 @@
+"http://1.2.3.4/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test38.json b/registereditems/ogc-utils/iri-or-curie/tests/test38.json
new file mode 100644
index 000000000..0342023be
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test38.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/stuff"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test39.json b/registereditems/ogc-utils/iri-or-curie/tests/test39.json
new file mode 100644
index 000000000..b754ff17e
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test39.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/stuff/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test4.json b/registereditems/ogc-utils/iri-or-curie/tests/test4.json
new file mode 100644
index 000000000..9b57caa52
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test4.json
@@ -0,0 +1 @@
+"ldap://[2001:db8::7]/c=GB?objectClass?one"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test40.json b/registereditems/ogc-utils/iri-or-curie/tests/test40.json
new file mode 100644
index 000000000..12fb1a1c0
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test40.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/hello%20world/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test41.json b/registereditems/ogc-utils/iri-or-curie/tests/test41.json
new file mode 100644
index 000000000..8ac112888
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test41.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?name=obi"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test42.json b/registereditems/ogc-utils/iri-or-curie/tests/test42.json
new file mode 100644
index 000000000..3d0daac1e
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test42.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?name=obi+wan&status=jedi"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test43.json b/registereditems/ogc-utils/iri-or-curie/tests/test43.json
new file mode 100644
index 000000000..fa952137a
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test43.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?onery"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test44.json b/registereditems/ogc-utils/iri-or-curie/tests/test44.json
new file mode 100644
index 000000000..8e7a42e5c
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test44.json
@@ -0,0 +1 @@
+"http://www.yahoo.com#bottom"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test45.json b/registereditems/ogc-utils/iri-or-curie/tests/test45.json
new file mode 100644
index 000000000..dd5bbaad0
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test45.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/yelp.html#bottom"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test46.json b/registereditems/ogc-utils/iri-or-curie/tests/test46.json
new file mode 100644
index 000000000..75bf46feb
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test46.json
@@ -0,0 +1 @@
+"https://www.yahoo.com/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test47.json b/registereditems/ogc-utils/iri-or-curie/tests/test47.json
new file mode 100644
index 000000000..9254eac8d
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test47.json
@@ -0,0 +1 @@
+"ftp://www.yahoo.com/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test48.json b/registereditems/ogc-utils/iri-or-curie/tests/test48.json
new file mode 100644
index 000000000..3dc3c36a8
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test48.json
@@ -0,0 +1 @@
+"ftp://www.yahoo.com/hello"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test49.json b/registereditems/ogc-utils/iri-or-curie/tests/test49.json
new file mode 100644
index 000000000..3b2a408db
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test49.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?name=%00%01"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test5.json b/registereditems/ogc-utils/iri-or-curie/tests/test5.json
new file mode 100644
index 000000000..497eb7e72
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test5.json
@@ -0,0 +1 @@
+"mailto:John.Doe@example.com"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test50.json b/registereditems/ogc-utils/iri-or-curie/tests/test50.json
new file mode 100644
index 000000000..70a5f5b63
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test50.json
@@ -0,0 +1 @@
+"http://www.yaho%6f.com"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test51.json b/registereditems/ogc-utils/iri-or-curie/tests/test51.json
new file mode 100644
index 000000000..a287b1f16
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test51.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/hello%00world/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test52.json b/registereditems/ogc-utils/iri-or-curie/tests/test52.json
new file mode 100644
index 000000000..3d800936c
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test52.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/hello+world/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test53.json b/registereditems/ogc-utils/iri-or-curie/tests/test53.json
new file mode 100644
index 000000000..cf1fab759
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test53.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?name=obi&"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test54.json b/registereditems/ogc-utils/iri-or-curie/tests/test54.json
new file mode 100644
index 000000000..f00451878
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test54.json
@@ -0,0 +1 @@
+"http://www.yahoo.com?name=obi&type="
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test55.json b/registereditems/ogc-utils/iri-or-curie/tests/test55.json
new file mode 100644
index 000000000..8f6d4ac42
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test55.json
@@ -0,0 +1 @@
+"http://www.yahoo.com/yelp.html#"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test56.json b/registereditems/ogc-utils/iri-or-curie/tests/test56.json
new file mode 100644
index 000000000..c93ab3dab
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test56.json
@@ -0,0 +1 @@
+"http://example.org/aaa/bbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test57.json b/registereditems/ogc-utils/iri-or-curie/tests/test57.json
new file mode 100644
index 000000000..a15514a6b
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test57.json
@@ -0,0 +1 @@
+"mailto:local@domain.org"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test58.json b/registereditems/ogc-utils/iri-or-curie/tests/test58.json
new file mode 100644
index 000000000..3da4fdff9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test58.json
@@ -0,0 +1 @@
+"mailto:local@domain.org#frag"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test59.json b/registereditems/ogc-utils/iri-or-curie/tests/test59.json
new file mode 100644
index 000000000..76d85185d
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test59.json
@@ -0,0 +1 @@
+"HTTP://EXAMPLE.ORG/AAA/BBB#CCC"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test6.json b/registereditems/ogc-utils/iri-or-curie/tests/test6.json
new file mode 100644
index 000000000..77b347da3
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test6.json
@@ -0,0 +1 @@
+"news:comp.infosystems.www.servers.unix"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test60.json b/registereditems/ogc-utils/iri-or-curie/tests/test60.json
new file mode 100644
index 000000000..91348aa95
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test60.json
@@ -0,0 +1 @@
+"http://example.org/aaa%2fbbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test61.json b/registereditems/ogc-utils/iri-or-curie/tests/test61.json
new file mode 100644
index 000000000..4106d5d6f
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test61.json
@@ -0,0 +1 @@
+"http://example.org/aaa%2Fbbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test62.json b/registereditems/ogc-utils/iri-or-curie/tests/test62.json
new file mode 100644
index 000000000..6b40032b5
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test62.json
@@ -0,0 +1 @@
+"http://example.com/%2F"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test63.json b/registereditems/ogc-utils/iri-or-curie/tests/test63.json
new file mode 100644
index 000000000..69ad0e9d7
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test63.json
@@ -0,0 +1 @@
+"http://example.com/?%2F"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test64.json b/registereditems/ogc-utils/iri-or-curie/tests/test64.json
new file mode 100644
index 000000000..f9a7a8d14
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test64.json
@@ -0,0 +1 @@
+"http://example.com/#?%2F"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test65.json b/registereditems/ogc-utils/iri-or-curie/tests/test65.json
new file mode 100644
index 000000000..a8db696c5
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test65.json
@@ -0,0 +1 @@
+"http://example.com/aaa%2Fbbb"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test66.json b/registereditems/ogc-utils/iri-or-curie/tests/test66.json
new file mode 100644
index 000000000..42504198c
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test66.json
@@ -0,0 +1 @@
+"http://example.org:80/aaa/bbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test67.json b/registereditems/ogc-utils/iri-or-curie/tests/test67.json
new file mode 100644
index 000000000..8a586784a
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test67.json
@@ -0,0 +1 @@
+"http://example.org:/aaa/bbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test68.json b/registereditems/ogc-utils/iri-or-curie/tests/test68.json
new file mode 100644
index 000000000..1395714e7
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test68.json
@@ -0,0 +1 @@
+"http://example.org./aaa/bbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test69.json b/registereditems/ogc-utils/iri-or-curie/tests/test69.json
new file mode 100644
index 000000000..f3de07d29
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test69.json
@@ -0,0 +1 @@
+"http://example.123./aaa/bbb#ccc"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test7.json b/registereditems/ogc-utils/iri-or-curie/tests/test7.json
new file mode 100644
index 000000000..df1cfae91
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test7.json
@@ -0,0 +1 @@
+"tel:+1-816-555-1212"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test70.json b/registereditems/ogc-utils/iri-or-curie/tests/test70.json
new file mode 100644
index 000000000..f8d1e0a26
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test70.json
@@ -0,0 +1 @@
+"http://example.org"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test71.json b/registereditems/ogc-utils/iri-or-curie/tests/test71.json
new file mode 100644
index 000000000..0a90823d2
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test71.json
@@ -0,0 +1 @@
+"http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test72.json b/registereditems/ogc-utils/iri-or-curie/tests/test72.json
new file mode 100644
index 000000000..bb6cdc53f
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test72.json
@@ -0,0 +1 @@
+"http://[1080:0:0:0:8:800:200C:417A]/index.html"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test73.json b/registereditems/ogc-utils/iri-or-curie/tests/test73.json
new file mode 100644
index 000000000..fbfd7ae87
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test73.json
@@ -0,0 +1 @@
+"http://[3ffe:2a00:100:7031::1]"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test74.json b/registereditems/ogc-utils/iri-or-curie/tests/test74.json
new file mode 100644
index 000000000..c00eb7ad9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test74.json
@@ -0,0 +1 @@
+"http://[1080::8:800:200C:417A]/foo"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test75.json b/registereditems/ogc-utils/iri-or-curie/tests/test75.json
new file mode 100644
index 000000000..b7f3e1bb9
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test75.json
@@ -0,0 +1 @@
+"http://[::192.9.5.5]/ipng"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test76.json b/registereditems/ogc-utils/iri-or-curie/tests/test76.json
new file mode 100644
index 000000000..22ba05a2a
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test76.json
@@ -0,0 +1 @@
+"http://[::FFFF:129.144.52.38]:80/index.html"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test77.json b/registereditems/ogc-utils/iri-or-curie/tests/test77.json
new file mode 100644
index 000000000..6ae9050f8
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test77.json
@@ -0,0 +1 @@
+"http://[2010:836B:4179::836B:4179]"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test78.json b/registereditems/ogc-utils/iri-or-curie/tests/test78.json
new file mode 100644
index 000000000..b5fa300e8
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test78.json
@@ -0,0 +1 @@
+"http://example/Andr&#567;"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test79.json b/registereditems/ogc-utils/iri-or-curie/tests/test79.json
new file mode 100644
index 000000000..ada9e140b
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test79.json
@@ -0,0 +1 @@
+"file:///C:/DEV/Haskell/lib/HXmlToolbox-3.01/examples/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test8.json b/registereditems/ogc-utils/iri-or-curie/tests/test8.json
new file mode 100644
index 000000000..b933d098d
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test8.json
@@ -0,0 +1 @@
+"telnet://192.0.2.16:80/"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test80.json b/registereditems/ogc-utils/iri-or-curie/tests/test80.json
new file mode 100644
index 000000000..ee29fd942
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test80.json
@@ -0,0 +1 @@
+"http://a/?"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test81.json b/registereditems/ogc-utils/iri-or-curie/tests/test81.json
new file mode 100644
index 000000000..c549e6f1b
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test81.json
@@ -0,0 +1 @@
+"http://example.com/?"
\ No newline at end of file
diff --git a/registereditems/ogc-utils/iri-or-curie/tests/test9.json b/registereditems/ogc-utils/iri-or-curie/tests/test9.json
new file mode 100644
index 000000000..1e12fe47b
--- /dev/null
+++ b/registereditems/ogc-utils/iri-or-curie/tests/test9.json
@@ -0,0 +1 @@
+"urn:oasis:names:specification:docbook:dtd:xml:4.1.2"
\ No newline at end of file