diff --git a/.gitignore b/.gitignore
index 815448bc5..ba4db5985 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,12 @@ dist
 
 *.DS_Store
 .vscode/
+
+# IntelliJ
+.idea/
+
+# hitory
+.history
+
+# editorconfig
+.editorconfig
\ No newline at end of file
diff --git a/bat-utils/lib/runtime-prometheus.js b/bat-utils/lib/runtime-prometheus.js
index 2c13d22be..99a855277 100644
--- a/bat-utils/lib/runtime-prometheus.js
+++ b/bat-utils/lib/runtime-prometheus.js
@@ -1,12 +1,10 @@
 import client from 'prom-client'
 import { BigNumber } from './extras-utils.js'
 import _ from 'underscore'
-import SDebug from 'bat-utils/lib/sdebug.js'
 const listenerPrefix = 'listeners:prometheus:'
 const listenerChannel = `${listenerPrefix}${process.env.SERVICE}`
 
 const settlementBalanceKey = 'settlement:balance'
-const Debug = new SDebug('boot')
 
 export default Prometheus
 
@@ -73,8 +71,6 @@ Prometheus.prototype.allMetrics = async function () {
   const keys = await cache.keysAsync(`${listenerChannel}.*`)
   const all = await cache.mgetAsync(keys)
   const metrics = all.map(JSON.parse)
-  Debug('metrics')
-  Debug(metrics)
   return client.AggregatorRegistry.aggregate(metrics)
 }
 
diff --git a/package-lock.json b/package-lock.json
index 0e921a24c..1099bf0a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -539,25 +539,25 @@
       }
     },
     "node_modules/@grpc/grpc-js": {
-      "version": "1.9.7",
-      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.7.tgz",
-      "integrity": "sha512-yMaA/cIsRhGzW3ymCNpdlPcInXcovztlgu/rirThj2b87u3RzWUszliOqZ/pldy7yhmJPS8uwog+kZSTa4A0PQ==",
+      "version": "1.10.9",
+      "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.10.9.tgz",
+      "integrity": "sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==",
       "dependencies": {
-        "@grpc/proto-loader": "^0.7.8",
-        "@types/node": ">=12.12.47"
+        "@grpc/proto-loader": "^0.7.13",
+        "@js-sdsl/ordered-map": "^4.4.2"
       },
       "engines": {
-        "node": "^8.13.0 || >=10.10.0"
+        "node": ">=12.10.0"
       }
     },
     "node_modules/@grpc/proto-loader": {
-      "version": "0.7.10",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.10.tgz",
-      "integrity": "sha512-CAqDfoaQ8ykFd9zqBDn4k6iWT9loLAlc2ETmDFS9JCD70gDcnA4L3AFEo2iV7KyAtAAHFW9ftq1Fz+Vsgq80RQ==",
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.13.tgz",
+      "integrity": "sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==",
       "dependencies": {
         "lodash.camelcase": "^4.3.0",
         "long": "^5.0.0",
-        "protobufjs": "^7.2.4",
+        "protobufjs": "^7.2.5",
         "yargs": "^17.7.2"
       },
       "bin": {
@@ -1042,6 +1042,15 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@js-sdsl/ordered-map": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz",
+      "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/js-sdsl"
+      }
+    },
     "node_modules/@newrelic/aws-sdk": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/@newrelic/aws-sdk/-/aws-sdk-7.3.0.tgz",
@@ -1893,12 +1902,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -3612,9 +3621,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -8783,9 +8792,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz",
-      "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
         "node": ">=10.0.0"
       },
diff --git a/test/secrets/consumer-ca1-signed.crt b/test/secrets/consumer-ca1-signed.crt
index 9027854d1..7fedeb627 100644
--- a/test/secrets/consumer-ca1-signed.crt
+++ b/test/secrets/consumer-ca1-signed.crt
@@ -1,20 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIDRDCCAiwCCQCFmhjZtJh6nTANBgkqhkiG9w0BAQsFADBjMR4wHAYDVQQDDBVj
-YTEudGVzdC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNP
-TkZMVUVOVDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYTAlVTMCAXDTIzMDgw
-MzE3NDM0NFoYDzIwNTAxMjE4MTc0MzQ0WjBjMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ2ExETAPBgNVBAcTCFBhbG9BbHRvMRIwEAYDVQQKEwlDT05GTFVFTlQxDTAL
-BgNVBAsTBFRFU1QxETAPBgNVBAMTCGNvbnN1bWVyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAiOHiGl0FvQ25i9MgJT+niYIXVw6h+kflQGnBre6zlwRG
-BBhmVTN8wQ2KNuwqqKkYQ3F87FNY8h8Ub5mjfEekS2XEcSTupTKRlpArZD9J+Gc4
-fVAUL0g7CX05J+IRLK9/I51HYsVfcLlugzbkNo5phnFs+fZy/VJOed3TCpc6oaaF
-H0l+oWKUfZv5OjXaYT2XGinbfIa6ed6RKiOZMb6ppX0oBoagj2+ftWUp4pHM6HxF
-5cKMP5ewu8yUsZi42JyJ8BJvqObb642RpKjB4ozG5XQMZyzcbNxRnkVDOTCQYb7U
-0ZnEnwHsCpmI4wopWmvmMdaIU+yjcmrFc5YNs9l/zwIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQA8ug6F7LmdcpdEnh+HUK3eXM331O/lY2wEDRQSV+aDdbfgTWnIN1oF
-44NQTu4ZguHpDLQZHMsKWPE0EN+FiA72/GV3ml9sIw97wHeV48asfHIm0Ox/uDSK
-fM/tA5/yI/vsytKPV0JcXXF7r2o7SG54+s80nlUiX3Br4lq14aLxANowqUjjwRg/
-s6j88aqG54LGP2ZKSjOIvEG6upSSADCSDF7kd8chfGSlDyxCtGSEhOw8wAUUBq3/
-6hQpmoZhcZF2QNZOhrwFXGqSCmeGv9HKYO8jxnm9+LtwtAcnT2LFlrhGac43TYCc
-PvsiarLyWczZVU3FoizQ9JygP9PHU7/e
+MIIEGDCCAwCgAwIBAgIUbxc6OVrjlA/sSQKNN1E5dzivsDkwDQYJKoZIhvcNAQEL
+BQAwYzEeMBwGA1UEAwwVY2ExLnRlc3QuY29uZmx1ZW50LmlvMQ0wCwYDVQQLDARU
+RVNUMRIwEAYDVQQKDAlDT05GTFVFTlQxETAPBgNVBAcMCFBhbG9BbHRvMQswCQYD
+VQQGEwJVUzAgFw0yNDA2MjAxNTA2MzVaGA8yMDUxMTEwNTE1MDYzNVowYzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQHEwhQYWxvQWx0bzESMBAGA1UE
+ChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMREwDwYDVQQDEwhjb25zdW1lcjCC
+AaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKquICuOtsIyhozcl4+1FFIN
+yTa7GW+rs3q8AmGz2P64AFzLi+QFnGqyx/mIrf5qW3Ro3SdJm92eJ4yiivZ2TtK2
+lTHXM55K65dCwA6CnaBCsIaotD4BRMLz3zcPP/f7Bft2jy7IrUgbDaCZZQIo0RB3
+8IBigxA3OcJs9EPEWeE3rW3bwEpYyxNklmbGEnp7aLB8gkuQaA7JIPkzt+uwkWjM
+oB9+5pIlG2Qfm/On1CEHGabzEVfHMjFS3Aodm30yqgj1v8hW5/rYS4cMyYpLsBg5
+K6qbh0CQVOS4pf7zi+Ng+jXkVkxN/mySXJSlZUQVTuJVtK6ShVTz77rwqs32B/jK
+KTPkfp9J1hFg9EfmtBtQBknK01GVxxv5v3kTnnUG0Rkw463KCAyQNtBq9ZPR7zkN
+y0FW3Ps4zqFa3ph1outN0hyWVXxMXF44zX19zlQ885arm4lkycvDhrkJrk0Nlqeb
+SYjZ4MveAaglTmaB2awj9HURG2qQ4pi/lzFDYBZr9wIDAQABo0IwQDAdBgNVHQ4E
+FgQU9FqsLqaZitp5V3ywNumDFsAeu/8wHwYDVR0jBBgwFoAUgPTcLg+LQv/TuB+1
+A815scrYDWIwDQYJKoZIhvcNAQELBQADggEBAAvSDNf3PSCYZ36yF3aCqQozboMG
+Q6GTS9r37wUicxLDbsmIhRZvQqHkDLLYz+16DaSmcBYHHrGxKAsdqxJsS1ljmx5a
+c/euw0cLvmRuYYNQSqY/vPkTkoHRLrwpsLYKdD0O9fjz7gTBxZyPr5izeqDtH5lI
+s/xjaRGUXuwJLmViFbbj9NDhrhnLh8fUUwbeXYOq7xS0Mo4QPF/hzVpB1IwfP7nr
+KHJN+3ez40lwPF+w1JcAYVqk/GtR+KnEMNp6iSle7kh1bcKFggItey5rDHEw42Rn
+xeFcgB8OcEA5yL32NyweAvUY1rxNMA2xPn2+NxH9t8TdOBdviAs/fb+daps=
 -----END CERTIFICATE-----
diff --git a/test/secrets/consumer-ca1-signed.pem b/test/secrets/consumer-ca1-signed.pem
index 22bc6a83a..0427ef766 100644
--- a/test/secrets/consumer-ca1-signed.pem
+++ b/test/secrets/consumer-ca1-signed.pem
@@ -1,17 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIICxTCCAa0CCQCFmhjZtJh6njANBgkqhkiG9w0BAQsFADBjMR4wHAYDVQQDDBVj
-YTEudGVzdC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNP
-TkZMVUVOVDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYTAlVTMCAXDTIzMDgw
-MzE3NDM1MloYDzIwNTAxMjE4MTc0MzUyWjBoMSMwIQYDVQQDDBpjb25zdW1lci50
-ZXN0LmNvbmZsdWVudC5pbzENMAsGA1UECwwEVEVTVDESMBAGA1UECgwJQ09ORkxV
-RU5UMREwDwYDVQQHDAhQYWxvQWx0bzELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcN
-AQEBBQADgY0AMIGJAoGBAN2vh4v0tcuItQL0KWdo1ZFlTC4/9nGN3E+nmq9wbKLw
-GD05qp740rMRsE0/9PpJZMpDJmgOQ9Q44r+SIiSPF4H+QdvAaMhJyOY3gTE/Akn5
-3HXOpRDhg/xJMv04XS4dx/L3XegG9SV1Bgi4zSw312OEOYR43/vX2IlG99VZXlo5
-AgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMMaA2zys1+38h7bEhzAyBn7smI7uk9s
-RkHmD/R6j2vZCx3C/q7Q5ppX57r1Ti5Bu7jqPMUaHCbrUTKJVTUugFUx5bBZSHV3
-EaCEbqV4qr5zRONgpmt2jn2MlR6+13fpyvEkNCGmg+0efQ3Qk49H+28cS+xR9lmW
-k2G+HfUMR49LLwm3J3nzmvuJBgSxey3ApJccGzIb5s+ry8OIwz7fiFAwqq07kRc8
-MCiaKeztc8tRArvzpu0HHkRICojGUPZDVQevJKbFwfJgJHfttu+nY5dRMH+n9yvF
-KyKj+GoKSpzA293r/UAf51WeA5MMxLm7hDahwSSJCgOX/31ph1Z+W7M=
+MIIDGTCCAgGgAwIBAgIUbxc6OVrjlA/sSQKNN1E5dzivsDowDQYJKoZIhvcNAQEL
+BQAwYzEeMBwGA1UEAwwVY2ExLnRlc3QuY29uZmx1ZW50LmlvMQ0wCwYDVQQLDARU
+RVNUMRIwEAYDVQQKDAlDT05GTFVFTlQxETAPBgNVBAcMCFBhbG9BbHRvMQswCQYD
+VQQGEwJVUzAgFw0yNDA2MjAxNTA2NDZaGA8yMDUxMTEwNTE1MDY0NlowaDEjMCEG
+A1UEAwwaY29uc3VtZXIudGVzdC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1Qx
+EjAQBgNVBAoMCUNPTkZMVUVOVDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYT
+AlVTMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6vgngKfaQe1rkq4vxYFpE
+gwcfvdYkfZNRTkv/nP+Vz8hnG8Xpw/b8+Zx4fq+qTshO7K5dT1jIhClZM/oKjPCz
+Z/KZFvEiOmXLO3FiHns86CoKzocm/wAl6xj66ZnAQfTwp5NwUu4k+B5N1GMgFcGs
+wBsMhcK/79UM+MwcpRS8TwIDAQABo0IwQDAdBgNVHQ4EFgQU7Q/+3+KfAxoDcSI5
+JEJN5iHnFwQwHwYDVR0jBBgwFoAUgPTcLg+LQv/TuB+1A815scrYDWIwDQYJKoZI
+hvcNAQELBQADggEBAEe1vgJotnRslhnwUxgPr9IuptcMo2zo9C/tvm7wkgN5NtxQ
+pNH3ibYDsSlzuiW5PliwVwwkow94MWKFin1gl7gDMBzmy5IApyOmy8Gqrn8wQuox
+2v2ZjDIgyQgneHhdUVRmN03an7zWayRdoj0NmzsKlsK0ufbUY/Dcr8dm8khCZT1x
+dcnsHAGjxIXou4TosjmituXgjzlh62gfa5ExZzny+WVrohJJi6YvfN+3YbRaP0x5
+PNfxefvF9u4c4QcdEp8M4rmsCjs5SGqbT4AedWEQ4PtFk2ITMrPf7BsZUfbuJsIw
+a6iDOoGNLuhVYfM1IfsqqSNvlo2tjtSSWMilm/c=
 -----END CERTIFICATE-----
diff --git a/test/secrets/consumer.client.key b/test/secrets/consumer.client.key
index 7db9d3c84..b36c89470 100644
--- a/test/secrets/consumer.client.key
+++ b/test/secrets/consumer.client.key
@@ -1,18 +1,18 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,3F5B73E811067B77
-
-GWTIeLsDLBPe6/6dxAOlEwi3zBmApDhHtFB0krzNpDUKqSE6XsxrKmYDLAeV19Tq
-xAB7+7zEstMauJZSye1AA5y8TAOSYigSbE3tnjY/QIRTVEWL38Jbpw+iJnTdBdh0
-XOTi2CX4A/RH6p+UscoLVorNWyB2orR7b5vOqj/7xBvR9WqB5hLObvYn1ovtpQtO
-FCl9zdhrpTHAWjOSFfkxDDgO4EYCeitS9RSUzWyQhClMcMu8UaUrYsNfqPqq9jen
-1ispn8oofDYXwU1sWg4CApuQugKC8KPdyKFaWAN5I1og3+PmKADU3rtc7cWeFEi/
-BwtG3RaDzmgw3s7DTRnAl/HjcmALdK9EBvxhUBMtXJLtO/ORZdo8A/pBQwvcmTd+
-SKsxvTmRSsWxlDcAKxl0T+gGlFUw487yrsDx8VqgPL2P9049xN09yrDOSh9Q2w2D
-3zMgAcgZrhRAOdeabNWyBdTTK31xaK0zSmr6ZL+9awzLo751Hk2hG/isqgYn6M7/
-Skz6Y9HgauzMTZzd+q2fEiLLlqSv2qUa9gxGujwp38m2wrT2wnrj2n6Xyst/cgNb
-3QcKVhpY3KOGaV9mCPVv4Osig6YWPfAPZbc6zRgz7Ekj9TP58S57qIO1lXhKEzg6
-qjun4HsB095COZszWVXrfXJ/k6uzFQxPeUzk13+2q2+Hp9Sy4+wg/3qTw1E4Db7E
-f3OVFBqnEx7js8xPowZ0a4ReHZN0xZ+6y2bIGvmntQau27aZXvtROhDqsFGbk9e2
-c6iaTiZHZPU/HzNgbrFs7pT4sZfQmnPAjyHCYL7zoZ/8HEsoSUAq8w==
------END RSA PRIVATE KEY-----
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+MIIC3DBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQkOmhaJ+KMohJdwBN
+iHV6cwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIrlHpdMjavh8EggKA
+puHZiUH9+C/s/P8ZI2gCs73Osrl4eZ2Cll5kBlhbe25XCJHs5lRkMToF8xu9d9Zc
+hdHJ8RXIKOFzddOEQVgsXHqFzXOtyoTRfWTT82PZPs3Ix0wxqbgPKnU72c04qpqf
+TyGWVlyqo8rbiBfqtUd62LbZysQHIPR6DtV6BprRGiIiM8ynTNKgvjx14vmth/nK
+Srz4584elkPSdVimidKvRgGQzHEhgxWNiIhUQYGz9XRSCLoCiIxtsrGTikfcx/db
+Djs0L0PdrnA2JLo4lYbrD8fFL2HAQNTtHr4ik72IbRxq9FbZBsjvR90lOFAwCVgL
+DXL9GM+7Blndtf6HDskJAsRkeFB98umBWzDzunz9ifVH/Ie+IafN74EA+/jzZMsq
+3CbDSzXSXGUVlTtTEQkDfFyIORjNwKrjG8aNqh96mGgr6pRGSC+MT8Dxz48RS8LE
+CpbGvPZBOlSd0W1/RsnlzitleUysfP8dj0BhunFWVNLDkjFj4p2IwJNwKeyDAUK1
+DcLMJdW7N+c1CHP9p59Fo9QWCnXNy7rAZv2jXZ8Tr83HVnf+ishTzhbd8vN2KS3m
+vBlfHZCI8TLeU0pOMAZpSQ1/wR3hBwWyg9xeLLPx64OC3sWh6CNwIbTryIdWqcG3
+M85/SYeZvOHBFya2OIoEA3VExwuMWzb/I65qc+yk0wV0mwccZCGlfCSRIknk29HO
+ggknmlMOPPCqUNimS5ohqLYZe97j/6a6dy7D1KfDwPH2WMjMRRSCF7ZOluEtX9A1
+kcWVBhzmWwrkYcdWeS443mD4lu3vWPpb5qtNvBHpQjR6HL1jqEfCy0UDkPm6VNQ8
+tsyQnFH6LOdL7eps9Rqv2g==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/secrets/consumer.client.req b/test/secrets/consumer.client.req
index c7f96aeb8..8c9af44d0 100644
--- a/test/secrets/consumer.client.req
+++ b/test/secrets/consumer.client.req
@@ -2,10 +2,10 @@
 MIIBqDCCARECAQAwaDEjMCEGA1UEAwwaY29uc3VtZXIudGVzdC5jb25mbHVlbnQu
 aW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNPTkZMVUVOVDERMA8GA1UEBwwI
 UGFsb0FsdG8xCzAJBgNVBAYTAlVTMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
-gQDdr4eL9LXLiLUC9ClnaNWRZUwuP/ZxjdxPp5qvcGyi8Bg9Oaqe+NKzEbBNP/T6
-SWTKQyZoDkPUOOK/kiIkjxeB/kHbwGjIScjmN4ExPwJJ+dx1zqUQ4YP8STL9OF0u
-Hcfy913oBvUldQYIuM0sN9djhDmEeN/719iJRvfVWV5aOQIDAQABoAAwDQYJKoZI
-hvcNAQELBQADgYEA2ymC5okkAtYHMll07GS0c1qLFcTVp0SQsKDuuFwvat7VFOhY
-YtiLrMHvCqDoOs8V7DNWwULbT0DsUbtehLuPAkjQArJ+qG9e1RtBMSUvTJMiuEZ7
-oNmN75jM3zufGtnW00vz9SuI0K+55PSsSwKzA79kIjXnnIspY+FDbA/KoPg=
+gQC6vgngKfaQe1rkq4vxYFpEgwcfvdYkfZNRTkv/nP+Vz8hnG8Xpw/b8+Zx4fq+q
+TshO7K5dT1jIhClZM/oKjPCzZ/KZFvEiOmXLO3FiHns86CoKzocm/wAl6xj66ZnA
+QfTwp5NwUu4k+B5N1GMgFcGswBsMhcK/79UM+MwcpRS8TwIDAQABoAAwDQYJKoZI
+hvcNAQELBQADgYEAC3mzsq8aOyR2weTxN7CE7L61YfCr7VSibLt8sgvAoX+XQta5
+iSNsOqQAn33yAFkrO9i5RsNMRPw/3p3s2ay8u9zcbSBaU0psrzVcVyu+FWPoxGVP
+s6K/+nfS8iyRzjrQ4P9ENqe+jWfxu63+/d4QWDeOiX5c0ZKdCQCF50RIuI8=
 -----END CERTIFICATE REQUEST-----
diff --git a/test/secrets/consumer.csr b/test/secrets/consumer.csr
index 5d4313887..ac9eb836e 100644
--- a/test/secrets/consumer.csr
+++ b/test/secrets/consumer.csr
@@ -1,18 +1,23 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC2DCCAcACAQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
+MIID2DCCAkACAQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
 EwhQYWxvQWx0bzESMBAGA1UEChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMREw
-DwYDVQQDEwhjb25zdW1lcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIjh4hpdBb0NuYvTICU/p4mCF1cOofpH5UBpwa3us5cERgQYZlUzfMENijbsKqip
-GENxfOxTWPIfFG+Zo3xHpEtlxHEk7qUykZaQK2Q/SfhnOH1QFC9IOwl9OSfiESyv
-fyOdR2LFX3C5boM25DaOaYZxbPn2cv1STnnd0wqXOqGmhR9JfqFilH2b+To12mE9
-lxop23yGunnekSojmTG+qaV9KAaGoI9vn7VlKeKRzOh8ReXCjD+XsLvMlLGYuNic
-ifASb6jm2+uNkaSoweKMxuV0DGcs3GzcUZ5FQzkwkGG+1NGZxJ8B7AqZiOMKKVpr
-5jHWiFPso3JqxXOWDbPZf88CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0O
-BBYEFOKs3M7uFm7cBsUOI4GXVnfxQsUWMA0GCSqGSIb3DQEBCwUAA4IBAQBsD7pl
-jqrKoXOwvGGkt1gZaVzWTdqqMKndW2QEeKQNwmzAr0WOeuWO0pkAb9V2zQuaBM68
-betwh1EDTloXAuJJtA7PCEFFlFS36JcOuVSULMo9O/29o/wvB/6s9SNDbHnLCmj3
-pmqvV+IE95ZAh4HneuVUK/uQI3MDKf6JIseogrLjT6zTLWhv84WccwTnmyO004r4
-omPcG+CRmSSIQJYfU3Jws4e+4V1DBIf6D/AMwCmfbUZU8uWpro3mMpFnXlzWtKhB
-BjtVpbAQRWguSwURYPfh49skHEav43w3Ke3hyVqN3BgW1ZX57xmDcDI01mVlloh1
-sMFL8ltlwM6oswi3
+DwYDVQQDEwhjb25zdW1lcjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
+AKquICuOtsIyhozcl4+1FFINyTa7GW+rs3q8AmGz2P64AFzLi+QFnGqyx/mIrf5q
+W3Ro3SdJm92eJ4yiivZ2TtK2lTHXM55K65dCwA6CnaBCsIaotD4BRMLz3zcPP/f7
+Bft2jy7IrUgbDaCZZQIo0RB38IBigxA3OcJs9EPEWeE3rW3bwEpYyxNklmbGEnp7
+aLB8gkuQaA7JIPkzt+uwkWjMoB9+5pIlG2Qfm/On1CEHGabzEVfHMjFS3Aodm30y
+qgj1v8hW5/rYS4cMyYpLsBg5K6qbh0CQVOS4pf7zi+Ng+jXkVkxN/mySXJSlZUQV
+TuJVtK6ShVTz77rwqs32B/jKKTPkfp9J1hFg9EfmtBtQBknK01GVxxv5v3kTnnUG
+0Rkw463KCAyQNtBq9ZPR7zkNy0FW3Ps4zqFa3ph1outN0hyWVXxMXF44zX19zlQ8
+85arm4lkycvDhrkJrk0NlqebSYjZ4MveAaglTmaB2awj9HURG2qQ4pi/lzFDYBZr
+9wIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU9FqsLqaZitp5V3yw
+NumDFsAeu/8wDQYJKoZIhvcNAQEMBQADggGBAGQepim9FLAJhDzSANXg9NdaQXjL
+elvGxQdMqRgDVeQjHfx+m+RnTknhA0wp+lTF+nsHrvLk99CMaACSNtjHQwp1fx8z
+38AXXuKir0mBiOhXmay3Nx7DN/R1ZRVDsEw/m+njUJwUyILPkrvmbLgYY9MfNk+a
+pYAeC67uz0AIf8gRI6ncwPcKDCxORIvmhvr5Up6z3cjib7eMMY94ZEvWD9a6A2VO
+aDFY6Sq7xigRegPwa3HXw94b25+sVBg222g2W5OJNZS6Etc6ytdeOrvTOpkjaIVk
+r9bUuHQK3vU+rSaMQEB6XlLqLIjVM77P3WVpE/c+hxlaSx74U0uo8Zn/OGYhSrtV
+Yu1VTDt0145jv8QPtvrQeIvcqBVcQTvsl4DZX6D3XqE0DLm8xd8yGi6vSx/oSvFC
+muAoTAISy5YIEPhMcydhfFuvs1hNk9slZEG1x5R1scree2F+6k+DTc7yWyH4iqMC
+2wxBzSogKDqofa6lSiSuJzwlKg750JYH0XTutA==
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/test/secrets/kafka.consumer.keystore.jks b/test/secrets/kafka.consumer.keystore.jks
index 962c13b14..b30fdee23 100644
Binary files a/test/secrets/kafka.consumer.keystore.jks and b/test/secrets/kafka.consumer.keystore.jks differ
diff --git a/test/secrets/kafka.consumer.truststore.jks b/test/secrets/kafka.consumer.truststore.jks
index 37f225f08..99351bd87 100644
Binary files a/test/secrets/kafka.consumer.truststore.jks and b/test/secrets/kafka.consumer.truststore.jks differ
diff --git a/test/secrets/kafka.kafka1.keystore.jks b/test/secrets/kafka.kafka1.keystore.jks
index 1c4f62126..3c67a83e7 100644
Binary files a/test/secrets/kafka.kafka1.keystore.jks and b/test/secrets/kafka.kafka1.keystore.jks differ
diff --git a/test/secrets/kafka.kafka1.truststore.jks b/test/secrets/kafka.kafka1.truststore.jks
index 55d0c1fbe..5cd086bb1 100644
Binary files a/test/secrets/kafka.kafka1.truststore.jks and b/test/secrets/kafka.kafka1.truststore.jks differ
diff --git a/test/secrets/kafka.producer.keystore.jks b/test/secrets/kafka.producer.keystore.jks
index 2b3f74f49..e48a38cbc 100644
Binary files a/test/secrets/kafka.producer.keystore.jks and b/test/secrets/kafka.producer.keystore.jks differ
diff --git a/test/secrets/kafka.producer.truststore.jks b/test/secrets/kafka.producer.truststore.jks
index 78eb9381c..c2ee2af0a 100644
Binary files a/test/secrets/kafka.producer.truststore.jks and b/test/secrets/kafka.producer.truststore.jks differ
diff --git a/test/secrets/kafka1-ca1-signed.crt b/test/secrets/kafka1-ca1-signed.crt
index ba8e0927e..24472dfca 100644
--- a/test/secrets/kafka1-ca1-signed.crt
+++ b/test/secrets/kafka1-ca1-signed.crt
@@ -1,20 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIDQjCCAioCCQCFmhjZtJh6mzANBgkqhkiG9w0BAQsFADBjMR4wHAYDVQQDDBVj
-YTEudGVzdC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNP
-TkZMVUVOVDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYTAlVTMCAXDTIzMDgw
-MzE3NDMzN1oYDzIwNTAxMjE4MTc0MzM3WjBhMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ2ExETAPBgNVBAcTCFBhbG9BbHRvMRIwEAYDVQQKEwlDT05GTFVFTlQxDTAL
-BgNVBAsTBFRFU1QxDzANBgNVBAMTBmthZmthMTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJiID7kUgG1xQ/BNE8HWB5WepQYUOnrl8dv24iT58KJqxLVw
-SCJqSkybnF/mQiLoBgmNWvn/3efIaKwEpLeU9jEN4ybMB9iYMJUfpzJmARW+4e46
-FxLwWEsJ32OrZnKzW655XfxlP+5APnoglzi6rnLfHXhIlqPSz4qUFKABrEksQOgh
-cb/ld9vjQ4tCjMj1iUJDQaKcoI42pF4CDWDpjRI9z8onhEBht7pxj0gOaW/XIfRc
-BDgOVwXo0P3kgwR1pKz6FinMSJWuli8PjTidNQvhtdbqdLN2290rKY/gc29SUtlY
-abTGe48GUv4EmXHm9d4PozpegEoL/RDQjVK9hcsCAwEAATANBgkqhkiG9w0BAQsF
-AAOCAQEAeAPJMiZMlmU+xPLImvyBkCYKUNCMYoCxslcy7ctcLgpWfwJRZd2L8Zhu
-QAY8mmzFifJHnD7a6M+MgDFD8AD9XeGXwWO/yOxrBrdXD623jh536Ibgj1q/wAq2
-Zr/i3F5JwmoRx8rfZi4E37h8ejGtHj6Va/ES8rJqxp1xZ+H7U737Qn0hUIO+Gghz
-i0By9fj3MhrQJDObj3UpWqn6i6LsJZhia8T7oerj4bUXWjkVv8j+IXDKIn3yHZK3
-ASKGRnLUa7Da61a53v2jzrlaorQF3wj4BXUtZHv+gMrhLIeD6wm34JkRxRr5VwQD
-ijbDDQiZVGNwcOdnDS3XthjtaZgNeA==
+MIIEFjCCAv6gAwIBAgIUbxc6OVrjlA/sSQKNN1E5dzivsDcwDQYJKoZIhvcNAQEL
+BQAwYzEeMBwGA1UEAwwVY2ExLnRlc3QuY29uZmx1ZW50LmlvMQ0wCwYDVQQLDARU
+RVNUMRIwEAYDVQQKDAlDT05GTFVFTlQxETAPBgNVBAcMCFBhbG9BbHRvMQswCQYD
+VQQGEwJVUzAgFw0yNDA2MjAxNTA2MjRaGA8yMDUxMTEwNTE1MDYyNFowYTELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQHEwhQYWxvQWx0bzESMBAGA1UE
+ChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMQ8wDQYDVQQDEwZrYWZrYTEwggGi
+MA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCTn6og62Ypxj8TMjpoSxogQ/h2
+cOG59blR4cP1pchKCrUFlM7uxUIV3w9eydvR4Qr7qwq9JTyCQgqbnJMYU+uS+jDE
+9P/NUtLIfPhd0sIg7jYpxYoAlgqeEMQwg5XlvGKu8ItxsQ9s7XXmt0LjabcZIFaT
+DVKQfnKPTXZ5z5IWg5htOjKTwuUkCNXQ4LTHu8KfTgqsUJN1rdmveLZzAl7Qvm44
+6G/XiLkROL8x+m21YRw0Zpb4cRpxbiUmuP4Nd1aHvaRG8i7JRepTN7QcW0rJt+Y/
+EGQt3auVZOYNlBSbehPwEbYgLaaJc7yYZNfgYNzFvdHFigVvZlPpntG5fr1pQKsR
+FC4BAv8BmnUc6/1pbULcB3OnwnmiD9oSAaRSceROaCiMdUqSoHf2m61f0Yh7wPh8
+Cakjo38ZnYGVFGlvDEtGZx7/X3uuPcnee1lcd7Y59U3GuVDVG/ujM9k/bbXcvvWx
+XuVFSWZYRR6Yy3xiGj1tlZyETFTYlTgeY8tuRcsCAwEAAaNCMEAwHQYDVR0OBBYE
+FBacDhMLB53C30CAJHupNkvUDY8HMB8GA1UdIwQYMBaAFID03C4Pi0L/07gftQPN
+ebHK2A1iMA0GCSqGSIb3DQEBCwUAA4IBAQBL5i2n5oOOQxzUP0I+gN1ApZ8hGu9P
+NJJjdN6T1uT+/C6/HkfhaH7qKKe8scg8KBxKXEtg1aQHU6z8SG3SRubJwk5WgNMd
+Hjtodz/a9Vs5gLKll7HUSsEaLydh8dgHmZPClQQBCGHQgBZyB6oUPIgFn7w1Kvm4
+g+lVX+Slx3SkM3MyzT5KdCZNJyKHhZ23fRc9c7yqqiEvTir67V9J0Nyw4K/oo4I8
+Gywe4qCVm8iIn+M2GvM6ARHrqW81YSDb0vPs5jcLqlSYfmkyUdrOeMESPGN26IeX
+mGYoz48h1ZOAg/cT/tS2jZnzna9j74Sn999c8jYgoryzSZAYP3L44ZhT
 -----END CERTIFICATE-----
diff --git a/test/secrets/kafka1.csr b/test/secrets/kafka1.csr
index f8b0e24c3..67b2c2d2a 100644
--- a/test/secrets/kafka1.csr
+++ b/test/secrets/kafka1.csr
@@ -1,18 +1,23 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC1jCCAb4CAQAwYTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
+MIID1jCCAj4CAQAwYTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
 EwhQYWxvQWx0bzESMBAGA1UEChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMQ8w
-DQYDVQQDEwZrYWZrYTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCY
-iA+5FIBtcUPwTRPB1geVnqUGFDp65fHb9uIk+fCiasS1cEgiakpMm5xf5kIi6AYJ
-jVr5/93nyGisBKS3lPYxDeMmzAfYmDCVH6cyZgEVvuHuOhcS8FhLCd9jq2Zys1uu
-eV38ZT/uQD56IJc4uq5y3x14SJaj0s+KlBSgAaxJLEDoIXG/5Xfb40OLQozI9YlC
-Q0GinKCONqReAg1g6Y0SPc/KJ4RAYbe6cY9IDmlv1yH0XAQ4DlcF6ND95IMEdaSs
-+hYpzEiVrpYvD404nTUL4bXW6nSzdtvdKymP4HNvUlLZWGm0xnuPBlL+BJlx5vXe
-D6M6XoBKC/0Q0I1SvYXLAgMBAAGgMDAuBgkqhkiG9w0BCQ4xITAfMB0GA1UdDgQW
-BBQm0TYta7BefPbEZ7ScfKor5nXozzANBgkqhkiG9w0BAQsFAAOCAQEAYFYAzEJj
-9deFgFBIiSust8xxgCusYUk2ZsSVy5eNmnpnfmQqG5wQckBLocmKTduTbwRvBSZp
-9U6nE+ljL8v4E9FI3X6HE7raLv5zo02+taiIVNi8ejfdTGc90frnCWG6/yDxOldj
-10haalRC4fMXyTuGEtJ+4WhX43L4jp5xqmlSLwhM4dQH02K8g2AI4M4z597FDcoW
-XqxAnVRAEyvH/CzwOu/UlCE+baErhYLIH7oMGslGcuMKoUNcxuqZppmFB+O92MPV
-pheVwXc2S2Z3xEZwSi+jKcRpv3crSejeEnngveOxeKSmznbwOgohmci+SXo34UAh
-fdUhGw5LZZBmNg==
+DQYDVQQDEwZrYWZrYTEwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCT
+n6og62Ypxj8TMjpoSxogQ/h2cOG59blR4cP1pchKCrUFlM7uxUIV3w9eydvR4Qr7
+qwq9JTyCQgqbnJMYU+uS+jDE9P/NUtLIfPhd0sIg7jYpxYoAlgqeEMQwg5XlvGKu
+8ItxsQ9s7XXmt0LjabcZIFaTDVKQfnKPTXZ5z5IWg5htOjKTwuUkCNXQ4LTHu8Kf
+TgqsUJN1rdmveLZzAl7Qvm446G/XiLkROL8x+m21YRw0Zpb4cRpxbiUmuP4Nd1aH
+vaRG8i7JRepTN7QcW0rJt+Y/EGQt3auVZOYNlBSbehPwEbYgLaaJc7yYZNfgYNzF
+vdHFigVvZlPpntG5fr1pQKsRFC4BAv8BmnUc6/1pbULcB3OnwnmiD9oSAaRSceRO
+aCiMdUqSoHf2m61f0Yh7wPh8Cakjo38ZnYGVFGlvDEtGZx7/X3uuPcnee1lcd7Y5
+9U3GuVDVG/ujM9k/bbXcvvWxXuVFSWZYRR6Yy3xiGj1tlZyETFTYlTgeY8tuRcsC
+AwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFBacDhMLB53C30CAJHup
+NkvUDY8HMA0GCSqGSIb3DQEBDAUAA4IBgQAAIME8llin9iQa31pjPPH8WODEoMWv
+KDpGfZkh0UzIlVELEMlWkkQYnX8HA+5S9ZkZouMG1XvnFqpypITiBc4Zf7JSP46F
+eWext+ylWofUAv49xY18D+OxWZ/j28vJOlr/HS/WwUHM+IoPgnGItREjrUNKup5n
+qYLN7pPFwOjS2BkVoH9pkxIO2WdUs68kx9dpJDsrL2wlanPRW4U7wdPDDrKupbjw
+twf1DPTLvJM8C75xx/lmlGRqM62KHUwrnTwzdLEX30MDu65JgGBc6xZWPuAMl6v7
+P3JZV+QTF68JabEyuqRgB+oGbJ7Qyzcl79UWSZIpkUEltohXv/juPyqJQ/IvDAFY
+pwtTfizkNIsiUndfw8tZUdU0YOEebgOSeEp6rHCTuyL9Rdo8qoLfkMaSRu0Fb4f0
+3zlHUWbkuMDTUHeCXNhe7/nOAnH2fm2YwmnR0MYc45jwgRhWcU9UvtE+8yXp2yru
+TJNqVmTy5KW2ENNn3r7RNIPKiddBXnavySs=
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/test/secrets/producer-ca1-signed.crt b/test/secrets/producer-ca1-signed.crt
index 9cfce4f07..3fe92507f 100644
--- a/test/secrets/producer-ca1-signed.crt
+++ b/test/secrets/producer-ca1-signed.crt
@@ -1,20 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIIDRDCCAiwCCQCFmhjZtJh6nDANBgkqhkiG9w0BAQsFADBjMR4wHAYDVQQDDBVj
-YTEudGVzdC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNP
-TkZMVUVOVDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYTAlVTMCAXDTIzMDgw
-MzE3NDM0MVoYDzIwNTAxMjE4MTc0MzQxWjBjMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCQ2ExETAPBgNVBAcTCFBhbG9BbHRvMRIwEAYDVQQKEwlDT05GTFVFTlQxDTAL
-BgNVBAsTBFRFU1QxETAPBgNVBAMTCHByb2R1Y2VyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAhubrfI0UBTtPtv3TmBLWm3WorzrifgHD8fat77lVcw9F
-E9pkNR52hET8XcjGdc/XHA3c+/XXDorOaaV8pzotSMHYUa+Hk10A1cIw017Ktv/W
-KIJv7DmH1eiKlqWQtl3QyFCqzdMOuDULo/yi5Hyb5v5sYvfYqNMO3ddudyHSxq2M
-llNWNf+l06tSgKf7BhB3qsQ3k92QHjNuJbxPDsLYXhGsfQYfZGgly/ZxGu5aBfTS
-0iUXq04qd//i8XTuC7QKSzLT996OMT8Bq6skPsp2GdMc7Fl7bW5C2uJ2IT0pyORN
-u1CwYM8AOGyIgFYQTjx4uYT71vFZA5fZ0+t6pn0N/wIDAQABMA0GCSqGSIb3DQEB
-CwUAA4IBAQDGW7KGLFltlPWJ59zHsDhjxtlEfSSDqaMXN8U30RzhaSP//XhuD0IX
-vOJDwvKFSqvoJDRL/QrraG6CQjHl/eGTM6QT2mFyXDZ4sdEf23jFuQiUqq1UWBxs
-E4v7Gstx/mGYiNovgbfjyYwZLWwruwXWcAAZLTzUzCxhyuD3hckK+3HSNWmemCZh
-rgPiFpmRg+wuL1QHXm0a01vEm00HJycYHe2/4BOduufX5qf1ldkFV1VsVdwBczWk
-+p/tl7LpiTs4PgSmNLN3dVXPRnGEBqEXkH6oqnHTCAoi6socZHq+xLW4dyUrt1Q0
-KDBQYZVhevZKrbKJaXEon+anD7oX58fp
+MIIEGDCCAwCgAwIBAgIUbxc6OVrjlA/sSQKNN1E5dzivsDgwDQYJKoZIhvcNAQEL
+BQAwYzEeMBwGA1UEAwwVY2ExLnRlc3QuY29uZmx1ZW50LmlvMQ0wCwYDVQQLDARU
+RVNUMRIwEAYDVQQKDAlDT05GTFVFTlQxETAPBgNVBAcMCFBhbG9BbHRvMQswCQYD
+VQQGEwJVUzAgFw0yNDA2MjAxNTA2MjlaGA8yMDUxMTEwNTE1MDYyOVowYzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQHEwhQYWxvQWx0bzESMBAGA1UE
+ChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMREwDwYDVQQDEwhwcm9kdWNlcjCC
+AaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAMAaxH+ZNUtrGlN77lXujiIg
+W38EkPoXVuefriOGuFsE/MKbM9LCcwGijgkmjG+qyEM7f6MlRPP3AdPvXz8wfE8J
+8HumPodm+pW7R7QkSnbYk0JSgUKpMQtclMVXBZynLGL4oATd5ajvwFj6Vl2vKSil
+SHprKhS5gRsn1jNcoatnB7Lrlq7irRae9/6JohRKi1gWdJfuflKB3HE8zS9w05t4
+N46mn+2rgizdXL8Z7WWN7feFMkAGk0gB11Hg5fuXd3lvKlYTNIIohQlxUVQmCfuh
+pge2utjyJPlOsgrHfZv0lLLM9qEoOeFX98UGpsVABjqkvFjlxk+IdymN9HzMiEc3
+ziPww1rHf8OJppZTMlL8WJU5n32I1asbHCjwJIqkiCrYOiDSLJ5imbYC0FuEZv97
+XkhqmKJe0lrncSlq2GxPzGmXMHdLSs11JTxhsWHcFi4eV5YoJT0J7F56U4V2CQEA
+VyP0xEZ3934V8iY1zTOcr0dEhpjgvhZP4AUTw3xEJQIDAQABo0IwQDAdBgNVHQ4E
+FgQU4ea7Q7qK1Fo35NOz3KClZm7eJGowHwYDVR0jBBgwFoAUgPTcLg+LQv/TuB+1
+A815scrYDWIwDQYJKoZIhvcNAQELBQADggEBABf/31/ucZdwYLDoj0Mw2XoxKXLa
+WWdtiqlZWousgXkptO8scl/wp+HnAVqf7z8yhpMWHvPs7hRFKEVscYC15qb0n9lo
+ef0GqSOe5CGnR67tneNmdJ2BQF+LfCFhuJZj59q+zL9mNKVgTzqdZYn+x6KXXkNb
+QXlTFxFROgE0ZbnOm4DqjJ12xibdiwnqBvg+8kR1s9WaSVyZR2qa3ofD9j31TVPB
+XOjat3X0J/lDStEz4jlDEbmBphPrfpRDQoLqxoB5OL3c0UKTbHB2xTnWv/gcV2Ty
+QNDcxoPYG6ubWFC3oy1xVIFZSP8S87NSO20+tYbYBgGwD5TsSP91H7UNvPQ=
 -----END CERTIFICATE-----
diff --git a/test/secrets/producer.csr b/test/secrets/producer.csr
index 168db46dd..3201d9af7 100644
--- a/test/secrets/producer.csr
+++ b/test/secrets/producer.csr
@@ -1,18 +1,23 @@
 -----BEGIN NEW CERTIFICATE REQUEST-----
-MIIC2DCCAcACAQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
+MIID2DCCAkACAQAwYzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNhMREwDwYDVQQH
 EwhQYWxvQWx0bzESMBAGA1UEChMJQ09ORkxVRU5UMQ0wCwYDVQQLEwRURVNUMREw
-DwYDVQQDEwhwcm9kdWNlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIbm63yNFAU7T7b905gS1pt1qK864n4Bw/H2re+5VXMPRRPaZDUedoRE/F3IxnXP
-1xwN3Pv11w6KzmmlfKc6LUjB2FGvh5NdANXCMNNeyrb/1iiCb+w5h9XoipalkLZd
-0MhQqs3TDrg1C6P8ouR8m+b+bGL32KjTDt3Xbnch0satjJZTVjX/pdOrUoCn+wYQ
-d6rEN5PdkB4zbiW8Tw7C2F4RrH0GH2RoJcv2cRruWgX00tIlF6tOKnf/4vF07gu0
-Cksy0/fejjE/AaurJD7KdhnTHOxZe21uQtridiE9KcjkTbtQsGDPADhsiIBWEE48
-eLmE+9bxWQOX2dPreqZ9Df8CAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0O
-BBYEFCN9Efw94cGY0wNRkvoZa6MRquiqMA0GCSqGSIb3DQEBCwUAA4IBAQCEr7dA
-vjsdNegsb9XFQe10l9o0vJd2u2umtDep4jP3/pvBAi9FnqAT9fSBh0NRESqTa3BO
-X+5RukQG5Nl81UmawybX/i5vB1USTVQWI1TybCAkn7xvj/uB2Vyf6z15q5UuIYIH
-XtCA/VE3ZTjXJs4ycCv2PcuSLUTJxvQuZI3LfkM0qxzKnHAvYbl4jOl0YsWrO9qg
-icDjulM5Pub64TSjhv/PEL28xl5JbQu5XKTp/19QUZLaTm1av5+gG0oG1QJzToFA
-MGLS0OabW2kbXBHiSyRYN0YSbBos890PZES3S2iGQqJmk3tS9msw0lqgQw6IQtQn
-HoIZ9+RZgaI/twLS
+DwYDVQQDEwhwcm9kdWNlcjCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGB
+AMAaxH+ZNUtrGlN77lXujiIgW38EkPoXVuefriOGuFsE/MKbM9LCcwGijgkmjG+q
+yEM7f6MlRPP3AdPvXz8wfE8J8HumPodm+pW7R7QkSnbYk0JSgUKpMQtclMVXBZyn
+LGL4oATd5ajvwFj6Vl2vKSilSHprKhS5gRsn1jNcoatnB7Lrlq7irRae9/6JohRK
+i1gWdJfuflKB3HE8zS9w05t4N46mn+2rgizdXL8Z7WWN7feFMkAGk0gB11Hg5fuX
+d3lvKlYTNIIohQlxUVQmCfuhpge2utjyJPlOsgrHfZv0lLLM9qEoOeFX98UGpsVA
+BjqkvFjlxk+IdymN9HzMiEc3ziPww1rHf8OJppZTMlL8WJU5n32I1asbHCjwJIqk
+iCrYOiDSLJ5imbYC0FuEZv97XkhqmKJe0lrncSlq2GxPzGmXMHdLSs11JTxhsWHc
+Fi4eV5YoJT0J7F56U4V2CQEAVyP0xEZ3934V8iY1zTOcr0dEhpjgvhZP4AUTw3xE
+JQIDAQABoDAwLgYJKoZIhvcNAQkOMSEwHzAdBgNVHQ4EFgQU4ea7Q7qK1Fo35NOz
+3KClZm7eJGowDQYJKoZIhvcNAQEMBQADggGBAE1Eur2cUy0chYsiGrJIOBNjFAhL
+ZASeyJatZC+mhFSCbqZ4cH0LoYTXbLQD63dSdjQ9u+F0YSmiGaYVnLK6F5boPe9N
+OS8DQpS5LfJk715z82eg0eY9RBYlX8M3s8aey7UlDaXSkv+q0DwlOwiFbAUeADz+
+eKO0kZizc7ZRzvbYLDCrLsrpD/8QJJxYN/5Dap7ybt0zpQVs2hoKw+7RKFNuZymR
+8re9q0wx2aMu3qo4olfbjFXigEhtOy/Q4kj4QS1rHNxUfOxzVsYhLcCsoNckIt5o
+TABgEmA5cojzgsq+BmHuV5AOEJJ7vDYSl0wuvqSFZG+jxhcv3E+geN67jczRXy4b
+BlHltxMmbnio4s0FOcQYOj0ZUZ3qNIK7CtccLrGUDcfWBAqHh6m8At6Yl6mSKVoa
+plMT01GrTmwrdD5Wd/+Ymzw825jjGEv6ay/4Ea5EJoHXjAGvV+y9Dp8PZC3Vo8uA
+1oW9AJE5R4oUM7PoEHHhMK6/+B0/X64sG4+WRw==
 -----END NEW CERTIFICATE REQUEST-----
diff --git a/test/secrets/snakeoil-ca-1.crt b/test/secrets/snakeoil-ca-1.crt
index e877b55a3..b470ea865 100644
--- a/test/secrets/snakeoil-ca-1.crt
+++ b/test/secrets/snakeoil-ca-1.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDmTCCAoGgAwIBAgIJAMD4Tu5tte4oMA0GCSqGSIb3DQEBCwUAMGMxHjAcBgNV
+MIIDpzCCAo+gAwIBAgIUPVIG/IKxKQyXjK8oeZa11G4XftgwDQYJKoZIhvcNAQEL
+BQAwYzEeMBwGA1UEAwwVY2ExLnRlc3QuY29uZmx1ZW50LmlvMQ0wCwYDVQQLDARU
+RVNUMRIwEAYDVQQKDAlDT05GTFVFTlQxETAPBgNVBAcMCFBhbG9BbHRvMQswCQYD
+VQQGEwJVUzAeFw0yNDA2MjAxNTA2MjJaFw0yNTA2MjAxNTA2MjJaMGMxHjAcBgNV
 BAMMFWNhMS50ZXN0LmNvbmZsdWVudC5pbzENMAsGA1UECwwEVEVTVDESMBAGA1UE
-CgwJQ09ORkxVRU5UMREwDwYDVQQHDAhQYWxvQWx0bzELMAkGA1UEBhMCVVMwHhcN
-MjMwODAzMTc0MzM2WhcNMjQwODAyMTc0MzM2WjBjMR4wHAYDVQQDDBVjYTEudGVz
-dC5jb25mbHVlbnQuaW8xDTALBgNVBAsMBFRFU1QxEjAQBgNVBAoMCUNPTkZMVUVO
-VDERMA8GA1UEBwwIUGFsb0FsdG8xCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA7rgvt72tJ+ZAjd+iHHf/EwowaP49vUPQEPaA8eKu
-HJqkkW8MKWh6fAc4ogssUPC6v7ozjHZqwtFGMepJgNr7lzeFcz6wxVPROZcJyOGt
-Y2GY6lO7TsrcCyVkB9WJz3l9QjpC3jkdcUsJoTiTPeV7vAm/J0rI711TMOkRXc3l
-GCJaHDx6o3oaTpTlay+GM//Gq2egNAaKL3yxlSqZLwwsLj6jO4JN8IJr+p31i3GM
-zo+U+BGB2flOn1i3H5yun/v4pD4+3yLlZ3B6R0Rc+FhLMVWtx1RLBb2BxBqIopG3
-YkZdBwdtAhyljYv1DU9Ig3ZHaKq+CD57f+3HZHgf70cRjQIDAQABo1AwTjAdBgNV
-HQ4EFgQU/sFOqVzgb0ztHuLczTJ3+Wt3J9UwHwYDVR0jBBgwFoAU/sFOqVzgb0zt
-HuLczTJ3+Wt3J9UwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAxrNI
-Dz+eTjK+sM+1IKEniDayYmQwNHq6ewTw1HNqJpML9oclNyTRUY4Y+Ffkmi07JX1F
-1LZL3BrRyYnSSkwz75wRum891SBj0pqjZKgI06/yXOP2J9LfL6fhQFGt7p+iY0J3
-t9G3mbzrW0h1bG9eUJMoATj67JTjpuzvUmVFNgkHC1PoPq/Bin8tbtdvTiQ147Sa
-R5oGViYwxkiLWElQbcvzxeG7IfWT172JKEVzgj0gn5UxJQnZ/tlxJ+fbPDLh1u5O
-7A6EhU+PiTjDaWHc1RtzyLbqtsoXlpSVv/8bwCNHu+jrSTSfKiv/ZxWf8Nh+bFZa
-DHaOVXSQULOt4kebcg==
+CgwJQ09ORkxVRU5UMREwDwYDVQQHDAhQYWxvQWx0bzELMAkGA1UEBhMCVVMwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1XrTBb0eZM5r4eEhcElTCHsbx
+npjXtUXiI1mcgDilhmGCOXrseuctNjDu2A2Cw1CWHxVCVMTprRzeZmCbmW7bnBG2
+96ZhEK1U0/fieQOvTJIUouJ6gcHvrO1PzY8v++awSsPZxX9sUjYg27SZulB4/H4g
+8X7oFKEQ0AMp3O4SoBsoEmtX5Qf2GezQUGkDelLIMhFW8xN8tytEtATJo1I2f62Z
+O8yy1iAhDdzxzZK6p0wU7CTOlhx1ZKzgNmb+BYrr0JgwtdpWaEqnJYxFT8ZHKs8w
+2EsveMnvddUYyrfB1lQxw9SFaqbRt7v7lBZTJ82f1rc7i+et5yTJdJbFn2VvAgMB
+AAGjUzBRMB0GA1UdDgQWBBSA9NwuD4tC/9O4H7UDzXmxytgNYjAfBgNVHSMEGDAW
+gBSA9NwuD4tC/9O4H7UDzXmxytgNYjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQCROUMuweGAAN/y3bmut/b17X69dP6XeLTltVJD6qMBfAx379pK
+y91lZNY2MxtEq6MDNXj+xVSDxfYaGVy0ZWrBTBwGiFRjy2Ze7nbwkVtpXb+cAugs
+b2YnLsufdh7eqcZUwSTOHjQETvRw/pXWifbsaL/hVdsOnVfsESeuK1soF+n23Chj
+o2XylqOJnscnmWwsm2WmDHcBvKEV/q36cHrVyvHn15F6GGih71f89jxT6/UxwPj6
+FBusCh4z55E8yU50iFfgAwZBcWCjC4/N2ohqLMkf6kIzbTK9YURcW2GGHZSEObx/
+yAPGXtlkwnfNjbMDmf+3tqzZOs+pvDk3V6JU
 -----END CERTIFICATE-----
diff --git a/test/secrets/snakeoil-ca-1.key b/test/secrets/snakeoil-ca-1.key
index 84778add8..07fe4d16a 100644
--- a/test/secrets/snakeoil-ca-1.key
+++ b/test/secrets/snakeoil-ca-1.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQInSc6xiTA2TQCAggA
-MBQGCCqGSIb3DQMHBAiWpjSILv72EwSCBMi/jJZpQYKH6SWWloO1wYkwcdOl3v8q
-KvVh2/5148i6Jgn19sVpmUQItMba6OTcKljqk9E7qQApEWjo9eyRdbtqxZLQvXEs
-Ym6FQ6afjedcCGFCPxN/4eC62VfybSrIoNI8UaT90OTLR0/vIBgdQb+Utdu3o+JF
-asSqNjUpfWhTZbwcg3LCcAJxZJ+ztL0vNQTYyIhz6WHCVYfMxzsOPhAkS+8EdC0n
-dQY0161vRjKEpW+b6faQpuGbgYQ5hKlMNJJ2fKMDsiaCTRmbGvV0OodxEKMTr6Q9
-1EEJngmykxIn9oiU4MW+1n+S565nmS7ffirqxmcmEEPhnlroWy9SqZnxA2bBVRcb
-ffP85Pn1ejUspiTsjSks01f4AIOKShowLAtgJGK26I1VvUgJQ9S33bx70OfVFkYK
-n0hjRVESFQcfm61bSH3F7P4v3X3Pw9uHkZ68FusD4lgYqAuPhkZKme6+mqyYDWP/
-FFVmSQGIN/IBrYrVo5jaeFBUqqDti9SURRwBpe6mw+bJxs8LVSWpAJfJHTSc8OfR
-5Gphe4FY+DYKWK9xj1HfIbmwIur9Fqv+PMTphhqPfvHdAfsHqtP0zlEocqJr9JPG
-wR+8nk03kwb/WC6s01HJRrrHUdn6DEzdbFJbufQQgTcmFFuLqAa0WqF/dvmda1JY
-hMA3QPoz8KFU8mXzeBf0AdokC29At6Et/zaZvioqvi94vEMKoDKUKNb+MZU+u3hN
-BA/tKtGc68loByVcLySPDGoYbSvv2X+4x2k9SlPAiF/vxpWi2j81bKmWAlNWmaqd
-44ykXA64pKt11iqCoNENgR+UDXWJZsnhhcC4NPhvB7Xlq5sJp+oUqkAruf4icIcD
-C2Km2vbWTdDs2tFJlz5JbTBFh3raeSgrirXgnaRw0no90fiYuKMNXLtQ25kgM21P
-urGjmUtXPWpbiIT+nBpwPbzm4TrLXBpoZ5orrUV56GkeXEPVvPU5YDH0Z3ZLNzl9
-PevPa+OZ5uW/l1a81LY0M3GmRaLaYGZ3rh93gDHu8g9po2URPUl1jqKCvu4HEIPU
-Q+CKdyAl5/MOag7MNmKeS6P1Qg3ZrHG1UrAegDFkWNxuG0f8qnT3XoOhU3XNQldk
-nPY8aEYN1DQDilHuaHbAO/vRgDFR6YWxd6SfaTTAL6r+qOBf8f9rxeLV2lDZwXeq
-5HGmqoxnx1SNnoNTZKYfGM0jEuAx5gzMWF56enbB6e5n9uYhLWYGLE0TkOl/P5eb
-0L3dXzqpehUAwGvthIa6e+kdDssm2sNLjVhSDjxJbKBgAtMobve+BFv+tx3OuUoh
-7T8z30pOM0a/wfqCQdZd9GLoww0mfPWPxiIwZomm0dgyDG6F9V3RWpMscqi/AROZ
-KOcFV2xgTpcDII7LtrDn15LqgZYrz/0YxIx4tOFv2gNJ9OKY5x3xCsJuO/hb4GJT
-gB+AKJVP+UKlrnx0RcZ3PpMJsrHCcJaKbudJwCgrjqXLmxaY7rbHsuv2ZNPezJAB
-69wtahg91rpCOiKu731tSC4JX2rM+xP7IGMqbStousO6Svqgx9u/52pHv7pZyXI6
-bOaqnuk4DSbh0n/NvVah86xCLzqH0nrxDL3p/E16LsJGad8HhWMBqXNTyO/kd6fn
-H60=
+MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQNr3I7jvR9tubP+5k
+NAvSRwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQI/q2Qm9lid1kEggTI
+fohMuLNNBP7IhThf2B4GWCmDo+rAzwBNFX4+nTFTcyIqktsHgo2KNLO5AUnGIjof
+s56u2yhqoBXUJqkFMrU8XG6kfB4cwm4fkpERrqF01sMusD8mKRqoX8vqv1xu0yGD
+HtXpYS2+FfqHGt5HCOsQreVxZKEvqM9pyd3dg4/Yfy7v7yHtTiJPXLXR+Re0VLgj
+xGMCTLgwQS0Vpy3uu+QnJ1WRZjEXHPmMWbwmLlmZgOrkDMV5XLTYUJzEPf7jNpPL
+2lx8tjLyKqFZqM6OU4EOyAZ8b+N5Hf5HLT3kqgeu8Kd4Z+UBl/i++YnVMwhIeIXo
+oMS8OtrPRHQgCFMSp/h9J9s8TYXtzVUvB2az8s4H+rl5rBqIfn8SoSetcDRyVq+d
+cOVXIbVKjSrI+l7+ZQ69z4qwYL8Zf+OK9VvRqvueexvsQoFY7lFBQhihY7zKNd7T
+4URvIpzg8jMzsx7Am9i+ShDQqXVOhoFB+65tTKeQhcRXt4LaZkz0xbqFknPQNGRS
+3PciaOw4dwPzuQZjxcDnE+RIgxMNzBv6yJjmO+ddDFbovEs+AgQqti6XOTh9952D
+X2mzu1v/X2NlQpeTJW2s5/xacbBdMEsBj5fwRGMO4ImkOx819NxLL9kdN9GZoWNy
+x7vFiTLThXV+v095y4pn/16OGUoP52KT0jqemmpVEmUhpGk9ERVyolkKv6o8QHUf
+/6RoP31HAiFz/9RQ+dBWFaR5s7gVb4s27+Z0wlsfRRUD1BbYs+4tfvRabZma2aBP
+P3DxFLqWJFDAvvCNqNLe1+guqsWiBKl4YMxD9EkxqGCwNyfd3lpARitlpAYAHqn4
+dQgotGKj6JCVC8kp8hRvgyUmb32riA96drCx9QfwRxJvRKfgaoOm9vbbc/v0xYgt
+u0c9HK2IPVW5xkrBsHvJNUsM3KqwNZ690Bv1oAhB7rQAcFIYI66en5wkYHu+NBaT
+dhAA3A7+1Dnu2+nMuI1GoraOgcc1oy5C0W5LhZxneDoIBugp9WtLazq+x+AIARKF
+XijMuuKBsufxQwXYXYNDHIijzTlTuDhVNLXKGimjD6zxlVFK3OW9ds1T2Gya0SCV
+n5xdJoEgP2hwOwsTmqDule0efKHee04chLNcyKeBFnjhwoDDvqsKb68F7UESYNpW
+cKmo8sQv8ZWq2z2xt5QhP6inOJ7k9dbY7cczBeB8ACcNqGyOaCcbZmc2nls0hS/o
+EHY76q12Z1vTgqBwa5U4HJ+Mb3HXiMmX+qoJ7xKzyC1ly0zvW+PXMVN4NofU/fqX
+Hr7Wvv/z3bOBuMuRkxuLiL08qqRjm8yKNtouQsebbsxGkleNBQHdlkRUBKSIrbXd
+RibzOdEwfUq07UQZcJl/mufgAU1VQGkzVbfXMhqgMFHXME1Hp/gzxEXfn+OXzigJ
+kkDKM9F6EyY249iKbLcY7QJktWTah4BYLGEsoSb2slm63m06VQ4z3pdyH9y+v4fG
+sBqSJTrGMNndJKlEcz1nE3GK3DkE9y1vYahVATbMC1ExQdTC9ocZWVp8LQehR2aL
+RxTcxOp8avmGddsI8zgPQcAFg4tJcA5lhtT9KnnQSKffDvJ8swQ/Up2tVVp9LqRX
+BVjHxTo26/3Bqs8XjQK9UIelYxptJwP8
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/test/secrets/snakeoil-ca-1.srl b/test/secrets/snakeoil-ca-1.srl
index aa3bfd45d..d0aeaec08 100644
--- a/test/secrets/snakeoil-ca-1.srl
+++ b/test/secrets/snakeoil-ca-1.srl
@@ -1 +1 @@
-859A18D9B4987A9E
+6F173A395AE3940FEC49028D3751397738AFB03A