diff --git a/COPYRIGHT b/COPYRIGHT
index 64014e9..35703f0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -26,6 +26,7 @@ Copyright: Unknown
 License: Unknown
 
 Files: dist.ini
+ lib/Test/FITesque/RDF.pm
  t/01basic.t
  t/integration-basic.t
  t/integration-http-list.t
@@ -34,6 +35,7 @@ Files: dist.ini
  t/lib/Internal/Fixture/Simple.pm
  t/unit-http-list.t
  t/unit-http-mix.t
+ t/unit-http-regex.t
  t/unit-http-server.t
  t/unit-list.t
  t/unit-multi-http.t
@@ -41,16 +43,14 @@ Files: dist.ini
  t/unit-multi.t
  t/unit-relative.t
  t/unit-simple.t
-Copyright: Copyright 2019 Kjetil Kjernsmo.
+Copyright: Copyright 2020 Kjetil Kjernsmo.
 License: Expat
 
 Files: Changes
  META.json
  META.yml
  doap.ttl
- lib/Test/FITesque/RDF.pm
- t/unit-http-regex.t
-Copyright: Copyright 2020 Kjetil Kjernsmo.
+Copyright: Copyright 2022 Kjetil Kjernsmo.
 License: Expat
 
 Files: COPYRIGHT
@@ -60,25 +60,25 @@ Copyright: None
 License: public-domain
 
 Files: Makefile.PL
-Copyright: Copyright 2013 Toby Inkster.
+Copyright: Copyright 2020 Toby Inkster.
 License: GPL-1.0+ or Artistic-1.0
 
 License: Expat
- This software is Copyright (c) 2020 by Kjetil Kjernsmo.
+ This software is Copyright (c) 2022 by Kjetil Kjernsmo.
  
  This is free software, licensed under:
  
    The MIT (X11) License
 
 License: Artistic-1.0
- This software is Copyright (c) 2020 by the copyright holder(s).
+ This software is Copyright (c) 2022 by the copyright holder(s).
  
  This is free software, licensed under:
  
    The Artistic License 1.0
 
 License: GPL-1.0
- This software is Copyright (c) 2020 by the copyright holder(s).
+ This software is Copyright (c) 2022 by the copyright holder(s).
  
  This is free software, licensed under:
  
diff --git a/LICENSE b/LICENSE
index 5fd2ad9..00ccf1a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2020 by Kjetil Kjernsmo.
+This software is Copyright (c) 2022 by Kjetil Kjernsmo.
 
 This is free software, licensed under:
 
diff --git a/META.json b/META.json
index a513dc4..a3d58f6 100644
--- a/META.json
+++ b/META.json
@@ -87,6 +87,6 @@
       "x_identifier" : "http://purl.org/NET/cpan-uri/dist/Test-FITesque-RDF/project"
    },
    "version" : "0.018",
-   "x_serialization_backend" : "JSON::PP version 2.97001",
+   "x_serialization_backend" : "JSON::PP version 4.06",
    "x_static_install" : 1
 }
diff --git a/Makefile.PL b/Makefile.PL
index 43addac..b85fe7d 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -138,28 +138,8 @@ else
 	}
 }
 
-sub FixMakefile
-{
-	return unless -d 'inc';
-	my $file = shift;
-	
-	local *MAKEFILE;
-	open MAKEFILE, "< $file" or die "FixMakefile: Couldn't open $file: $!; bailing out";
-	my $makefile = do { local $/; <MAKEFILE> };
-	close MAKEFILE or die $!;
-	
-	$makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
-	$makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
-	$makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
-	$makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
-	$makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-	
-	open  MAKEFILE, "> $file" or die "FixMakefile: Couldn't open $file: $!; bailing out";
-	print MAKEFILE $makefile or die $!;
-	close MAKEFILE or die $!;
-}
 
 my $mm = WriteMakefile(%WriteMakefileArgs);
-FixMakefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+
 exit(0);
 
diff --git a/README b/README
index 427257f..3576a78 100644
--- a/README
+++ b/README
@@ -302,7 +302,7 @@ AUTHOR
     Kjetil Kjernsmo <kjetilk@cpan.org>.
 
 COPYRIGHT AND LICENCE
-    This software is Copyright (c) 2019 by Inrupt Inc.
+    This software is Copyright (c) 2019, 2020 by Inrupt Inc.
 
     This is free software, licensed under:
 
diff --git a/README.md b/README.md
index 813de98..1a440e4 100644
--- a/README.md
+++ b/README.md
@@ -324,7 +324,7 @@ Kjetil Kjernsmo <kjetilk@cpan.org>.
 
 # COPYRIGHT AND LICENCE
 
-This software is Copyright (c) 2019 by Inrupt Inc.
+This software is Copyright (c) 2019, 2020 by Inrupt Inc.
 
 This is free software, licensed under:
 
diff --git a/SIGNATURE b/SIGNATURE
index 09f2e50..bcb6e02 100644
--- a/SIGNATURE
+++ b/SIGNATURE
@@ -1,5 +1,5 @@
 This file contains message digests of all files listed in MANIFEST,
-signed via the Module::Signature module, version 0.83.
+signed via the Module::Signature module, version 0.88.
 
 To verify the content in this distribution, first make sure you have
 Module::Signature installed, then type:
@@ -12,22 +12,22 @@ the distribution may already have been compromised, and you should
 not run its Makefile.PL or Build.PL.
 
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: RIPEMD160
 
-SHA256 7b62f96424e3fecfd1fdde40bbc44159303e21073f2f8d1acfa669275f185b5a COPYRIGHT
+SHA256 f42d6d20edc8d456a90798e2dd149fed4f39d45f99536a64d9962d6596e697d0 COPYRIGHT
 SHA256 c2fa5f625b8687ad497be645c96ca038d9c28c3a052e07523f06f240c17a9799 CREDITS
 SHA256 4cff263ba857c8d44d1106cc9026fc7621689142542cd2153272afc58d0193c1 Changes
 SHA256 8fd1468ddacc4d6d78f175943e8a5b918e87cc44b1e2edf913ca114fd0bf0708 INSTALL
-SHA256 b90e5ee8ac6aa5503fafe671ac7ee2e705d75157d8137d1fe640c93083a67a5f LICENSE
+SHA256 63bc32f75eb4cb9c5a688eb4cffb959949ab803c4f4799ce58f21f3bad92f9fd LICENSE
 SHA256 e19b54081db6f783e167b8178c5ca0fc4a3f356143ea86c27bbaf6ff39a28e20 MANIFEST
-SHA256 dc8626888a3dbe4d942f3d98e6969ae40264321d9e3bc1ad52fcec5750e064ce META.json
+SHA256 0ae1c1299a345520150171e8e606e9ccd59524c3fdce3090a6c743f093018ccc META.json
 SHA256 bdbc8fc72bda1102ae80a18d50b28e0d12d87e933bc8f54da87344a9367d6e97 META.yml
-SHA256 7c75f1ff9230ebd28e9713e05f1548197d7cd268f15c64dea0875b166c0acd1c Makefile.PL
-SHA256 826fd973a11e7cc144aa26fcb9944eab1cc4e4a19d102de7f61da417cebc6380 README
-SHA256 1f7a5b781f31118e907bff255c3af3201c785aaeaff45bf5394215d73c17c8a4 README.md
+SHA256 18df7402907e8ba6c4380f1256497df0313a608c23a37237702e3379cd09586f Makefile.PL
+SHA256 a1f3741757471321cfefb7ce8e5abb4bb4309743206bfffc572db76771210506 README
+SHA256 57c33270d60fa178ff3914a61f738c2f77bf17e51ebdb62603f50fcf36a9e916 README.md
 SHA256 fb7d510bfb8c69d33753a712fb9ab4b159a89b6435ed69d7be15e8783ee1a250 dist.ini
-SHA256 276654bde63cbe0446f0e6c607275ea54e51f39452771cf7f33b191039c23670 doap.ttl
-SHA256 c9a4940617dd3ba76c7ddacc68799b6f673b8f41669549164993b96e54507828 lib/Test/FITesque/RDF.pm
+SHA256 2ae027aaf0103f20b26d4aa501da172a4684169d78b340d3a53634553e9c1647 doap.ttl
+SHA256 20f21c71894f6c821bce55d13c8dac96e4f32cc6cb6e9c5a200e5a8736029ad1 lib/Test/FITesque/RDF.pm
 SHA256 3c01388312e5d42a15630b913efca12a615f082948e0d17fd622ea1ed850cf43 t/01basic.t
 SHA256 8a6792e7905f9e2ceafa3a5c9a3b9eaa5c5e0f20a42df84b4a5045ef635343f1 t/data/http-external-content-blank.ttl
 SHA256 0bc576b8257876f9e00bb18fc2d303c977dce33203eccabeee643838f083a869 t/data/http-external-content-invalid.ttl
@@ -59,19 +59,3 @@ SHA256 0bc3f7720a9a159210e4cc8fab54dcd9533c19143a9388c3965aacee3a520e98 t/unit-m
 SHA256 f337aaaa2d1f7ad74fcdc6f41fe05688e49dc07493cd069eaf640ca7b584dbf3 t/unit-multi.t
 SHA256 5b8023324c9ece4e4699001f8fcf52f1d690dc4fb980dbcda87b5cfc38c515a3 t/unit-relative.t
 SHA256 6caf112a41b2e3a6c20a0c2773163ce1cd13bdce1f3d7d077c00df91f19faf83 t/unit-simple.t
------BEGIN PGP SIGNATURE-----
-
-iQIzBAEBCAAdFiEEDsyLxtCi6bk7pBcmf77o3zqeSqUFAl47ZvQACgkQf77o3zqe
-SqUuHQ/+NK4RB383z1D4cX5V4XtlhVfrPXtZy4Nn02ahX8FD6n/MMVXskiW0UweE
-+lYiFVHPIllK4+BlIkF6QG0tDRoUOc9j5zAAw1mKmYGU8tdQ2//GITJUX0FOJHDs
-lyP+mMi1HCOU2tYBZw9Q8JE5yvhuWY3oN+ZxhxeGdj/7jy0pNh6y/7pTf9XwsMUI
-HAeeOkKRGw9jwGPv+uqbi+YC3IrkfFJOagUV6bied/lXhwLhmeihXRGYH4aqFfhK
-kHXOjg1NlIQu72wnkQIYStq8CNFw/nPyxOR3gpvbP8117mEWBDMMpJEJ3pORCBHh
-moRJ/lP3SvsUn28EFzN3W2Bunu2BWrIjQRC3+HHwk3VpSxcamFdc6YaItoU+FM6h
-iGqTmxvwWiWWZ5YUROWKEtzo6teZcdmhMjDTQMRPv1CgPVLazwvBitytQls6cRN4
-o5mngpVd13ZlwcLstAWXfLkps6fDSBQ/Mq2F4j1CBnl9Lfa3bwm3EH+HVBmlfL8v
-nPghJDcQ4g+CyiEFNzkUiKs3aizZwlIdrCUWc5S+NEe/3CrtqewKEgyfgKIdcCCV
-lnCI4PIO16jgWW48DvZwBDNW+5Qzdl9fjeU3iGL8x3siaiFUh4tAzsEchzuMcTrU
-B5Lf0prbCTZKDxaK80byAmSJsaBM5bPz0E5BCdwDQWIluA2XT5k=
-=iGPt
------END PGP SIGNATURE-----
diff --git a/debian/changelog b/debian/changelog
index 4940335..20fde60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libtest-fitesque-rdf-perl (0.018+git20200206.1.6dd18b4-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 15 Apr 2022 13:49:21 -0000
+
 libtest-fitesque-rdf-perl (0.018-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/doap.ttl b/doap.ttl
index 7e4a711..0c91608 100644
--- a/doap.ttl
+++ b/doap.ttl
@@ -6,8 +6,6 @@
 @prefix owl:   <http://www.w3.org/2002/07/owl#> .
 @prefix prov:  <http://www.w3.org/ns/prov#> .
 @prefix rdfs:  <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix types: <http://rdfs.org/sioc/types#> .
-@prefix wot:   <http://xmlns.com/wot/0.1/> .
 @prefix xsd:   <http://www.w3.org/2001/XMLSchema#> .
 
 <http://purl.org/NET/cpan-uri/dist/Test-FITesque-RDF/project>
@@ -261,38 +259,14 @@
 
 <http://purl.org/NET/cpan-uri/person/kjetilk>
 	a                    foaf:Person;
-	foaf:mbox            <mailto:kjetilk@cpan.org>;
 	foaf:name            "Kjetil Kjernsmo";
-	foaf:nick            "KJETILK", "KjetilK";
+	foaf:nick            "KJETILK";
 	foaf:page            <https://metacpan.org/author/KJETILK>;
-	owl:sameAs           <http://git2prov.org/git2prov?giturl=https://github.com/kjetilk/p5-test-fitesque-rdf&serialization=PROV-O#user-Kjetil-Kjernsmo>, <http://www.kjetil.kjernsmo.net/foaf#me>, <https://solid.kjernsmo.net/profile/card#me>;
-	rdfs:seeAlso         <http://www.kjetil.kjernsmo.net/foaf>;
-	wot:hasKey           _:B1.
+	owl:sameAs           <http://git2prov.org/git2prov?giturl=https://github.com/kjetilk/p5-test-fitesque-rdf&serialization=PROV-O#user-Kjetil-Kjernsmo>.
 
 <http://purl.org/NET/cpan-uri/person/konobi>
 	a                    foaf:Person;
-	foaf:name            "Scott McWhirter", "Scott McWirther";
-	foaf:nick            "KONOBI", "konobi";
+	foaf:name            "Scott McWirther";
+	foaf:nick            "KONOBI";
 	foaf:page            <https://metacpan.org/author/KONOBI>.
 
-<http://www.kjetil.kjernsmo.net/foaf#me>
-	a                    foaf:Person;
-	foaf:homepage        <http://kjetil.kjernsmo.net/>;
-	foaf:mbox            <mailto:kjetilk@cpan.org>;
-	foaf:name            "Kjetil Kjernsmo";
-	foaf:nick            "KjetilK";
-	owl:sameAs           <http://purl.org/NET/cpan-uri/person/kjetilk>, <https://solid.kjernsmo.net/profile/card#me>;
-	rdfs:seeAlso         <http://www.kjetil.kjernsmo.net/foaf>, <https://solid.kjernsmo.net/profile/card>;
-	wot:hasKey           _:B1.
-
-<http://www.opensource.org/licenses/mit-license.php>
-	dc:title             "The MIT License"@en.
-
-<irc://irc.perl.org/#perlrdf>
-	a                    types:ChatChannel;
-	dc:title             "The Perl and RDF IRC channel"@en.
-
-_:B1
-	a                    wot:PubKey;
-	wot:fingerprint      "0ECC8BC6D0A2E9B93BA417267FBEE8DF3A9E4AA5".
-
diff --git a/lib/Test/FITesque/RDF.pm b/lib/Test/FITesque/RDF.pm
index 96ec60a..bcf91dd 100644
--- a/lib/Test/FITesque/RDF.pm
+++ b/lib/Test/FITesque/RDF.pm
@@ -565,7 +565,7 @@ Kjetil Kjernsmo E<lt>kjetilk@cpan.orgE<gt>.
 
 =head1 COPYRIGHT AND LICENCE
 
-This software is Copyright (c) 2019 by Inrupt Inc.
+This software is Copyright (c) 2019, 2020 by Inrupt Inc.
 
 This is free software, licensed under: