diff --git a/.classpath b/.classpath
index 05943dc1221..4ee8da2f869 100644
--- a/.classpath
+++ b/.classpath
@@ -14,14 +14,14 @@
 	<classpathentry kind="lib" path="test/lib/fest/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.4.jar"/>
+	<classpathentry kind="lib" path="test/lib/equalsverifier-2.4.1.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/reflections-0.9.10.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/guava-21.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
 	<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
 	<classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.10.1.jar"/>
+	<classpathentry kind="lib" path="test/lib/wiremock-standalone-2.13.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.0.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 4824b802631..4add34aca36 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding//windows/locale=ISO-8859-1
 encoding/<project>=UTF-8
diff --git a/netbeans/nbproject/project.properties b/netbeans/nbproject/project.properties
index 7dcd191fb92..80f7626ac56 100644
--- a/netbeans/nbproject/project.properties
+++ b/netbeans/nbproject/project.properties
@@ -37,7 +37,7 @@ file.reference.commons-logging-1.1.3.jar=../test/lib/unitils-core/commons-loggin
 file.reference.commons-testing-2.1.0.jar=../test/lib/commons-testing/commons-testing-2.1.0.jar
 file.reference.core-src=../src
 file.reference.debug-1.0.jar=../test/lib/fest/debug-1.0.jar
-file.reference.equalsverifier-2.4.jar=../test/lib/equalsverifier-2.4.jar
+file.reference.equalsverifier-2.4.1.jar=../test/lib/equalsverifier-2.4.1.jar
 file.reference.fest-assert-1.0.jar=../test/lib/fest/fest-assert-1.0.jar
 file.reference.fest-reflect-1.1.jar=../test/lib/fest/fest-reflect-1.1.jar
 file.reference.fest-swing-1.1.jar=../test/lib/fest/fest-swing-1.1.jar
@@ -57,7 +57,7 @@ file.reference.test-performance=../test/performance
 file.reference.test-unit=../test/unit
 file.reference.unitils-core-3.4.6.jar=../test/lib/unitils-core/unitils-core-3.4.6.jar
 file.reference.system-rules-1.16.1.jar=../test/lib/system-rules-1.16.1.jar
-file.reference.wiremock-standalone-2.10.1.jar=../test/lib/wiremock-standalone-2.10.1.jar
+file.reference.wiremock-standalone-2.13.0.jar=../test/lib/wiremock-standalone-2.13.0.jar
 file.reference.awaitility-3.0.0.jar=../test/lib/awaitility-3.0.0.jar
 includes=**/*.java
 jar.compress=false
@@ -75,7 +75,7 @@ javac.test.classpath=\
     ${build.classes.dir}:\
     ${file.reference.junit-4.12.jar}:\
     ${file.reference.jfcunit.jar}:\
-    ${file.reference.equalsverifier-2.4.jar}:\
+    ${file.reference.equalsverifier-2.4.1.jar}:\
     ${file.reference.hamcrest-core-1.3.jar}:\
     ${file.reference.MRJToolkitStubs-1.0.jar}:\
     ${file.reference.debug-1.0.jar}:\
@@ -93,7 +93,7 @@ javac.test.classpath=\
     ${file.reference.ognl-2.6.9.jar}:\
     ${file.reference.unitils-core-3.4.6.jar}:\
     ${file.reference.system-rules-1.16.1.jar}:\
-    ${file.reference.wiremock-standalone-2.10.1.jar}:\
+    ${file.reference.wiremock-standalone-2.13.0.jar}:\
     ${file.reference.awaitility-3.0.0.jar}:\
     ${file.reference.spotbugs.jar}:\
     ${file.reference.commons-testing-2.1.0.jar}
diff --git a/test/lib/equalsverifier-2.4.jar b/test/lib/equalsverifier-2.4.1.jar
similarity index 85%
rename from test/lib/equalsverifier-2.4.jar
rename to test/lib/equalsverifier-2.4.1.jar
index a5bd6278891..fa0d5d20f83 100644
Binary files a/test/lib/equalsverifier-2.4.jar and b/test/lib/equalsverifier-2.4.1.jar differ
diff --git a/test/lib/wiremock-standalone-2.10.1.jar b/test/lib/wiremock-standalone-2.13.0.jar
similarity index 90%
rename from test/lib/wiremock-standalone-2.10.1.jar
rename to test/lib/wiremock-standalone-2.13.0.jar
index 422aa196c87..4548122506c 100644
Binary files a/test/lib/wiremock-standalone-2.10.1.jar and b/test/lib/wiremock-standalone-2.13.0.jar differ