diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 037271a9a..aaaa205c1 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -2,9 +2,15 @@ name: Erlang CI
 
 on:
   push:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
   pull_request:
-    branches: [ nhse-develop ]
+    branches:
+      - nhse-develop
+      - nhse-develop-3.2
+      - nhse-develop-3.4
 
 
 jobs:
@@ -17,25 +23,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        otp: [22, 24, 25]
+        otp: [24, 26]
         os: [ubuntu-latest]
-        # OTP lower than 23 does not run on ubuntu-latest (22.04), see
-        # https://github.com/erlef/setup-beam#compatibility-between-operating-system-and-erlangotp
-        exclude:
-          - otp: 22
-            os: ubuntu-latest
-        include:
-          - otp: 22
-            os: ubuntu-20.04
 
     steps:
       - uses: lukka/get-cmake@latest
-      - uses: actions/checkout@v2
-      - name: Install dependencies (Ubuntu)
-        if: ${{ startsWith(matrix.os, 'ubuntu') }}
-        run: |
-          sudo apt-get -qq update
-          sudo apt-get -qq install libsnappy-dev libc6-dev
+      - uses: actions/checkout@v4
       - name: Install Erlang/OTP
         uses: erlef/setup-beam@v1
         with:
diff --git a/rebar.config b/rebar.config
index 8c43a6981..8d6860052 100644
--- a/rebar.config
+++ b/rebar.config
@@ -23,7 +23,7 @@
   {riak_ensemble, {git, "https://github.com/nhs-riak/riak_ensemble", {branch, "nhse-develop"}}},
   {pbkdf2, {git, "https://github.com/nhs-riak/erlang-pbkdf2.git", {branch, "nhse-develop"}}},
   {cluster_info, {git, "https://github.com/nhs-riak/cluster_info.git", {branch, "nhse-develop"}}},
-  {exometer_core, {git, "https://github.com/Feuerlabs/exometer_core.git", {tag, "1.6.1"}}},
+  {exometer_core, "2.0.0"},
   {basho_stats, {git, "https://github.com/nhs-riak/basho_stats.git", {branch, "nhse-develop"}}}
 ]}.
 
diff --git a/src/riak_core_exo_monitor.erl b/src/riak_core_exo_monitor.erl
deleted file mode 100644
index 2ec2edda7..000000000
--- a/src/riak_core_exo_monitor.erl
+++ /dev/null
@@ -1,82 +0,0 @@
-%% -------------------------------------------------------------------
-%%
-%% Copyright (c) 2014 Basho Technologies, Inc.  All Rights Reserved.
-%%
-%%   This Source Code Form is subject to the terms of the Mozilla Public
-%%   License, v. 2.0. If a copy of the MPL was not distributed with this
-%%   file, You can obtain one at http://mozilla.org/MPL/2.0/.
-%%
-%% -------------------------------------------------------------------
-%%
-%% @doc Legacy mapping module folsom metrics to exometer
-%%
-%% @end
--module(riak_core_exo_monitor).
--behaviour(exometer_folsom_monitor).
--behaviour(exometer_entry).
-
--export([copy_folsom/3]).
--export([behaviour/0,
-	 delete/3,
-	 get_datapoints/3,
-	 get_value/4,
-	 new/3,
-	 reset/3,
-	 sample/3,
-	 setopts/3,
-	 update/4]).
-
-behaviour() ->
-    entry.
-
-copy_folsom(Name, Type, Opts) when is_tuple(Name) ->
-    Prefix = riak_core_stat:prefix(),
-    {[Prefix|tuple_to_list(Name)], ad_hoc, [{folsom_name, Name},
-					    {module, ?MODULE},
-					    {type, Type}
-					    | options(Type, Opts)]};
-copy_folsom(_, _, _) ->
-    false.
-
-new(N, _, Opts) ->
-    {ok, {proplists:get_value(type, Opts, unknown),
-	  proplists:get_value(folsom_name, Opts, N)}}.
-
-update(_, Value, counter, {_, Name}) ->
-    folsom_metrics:notify_existing_metric(Name, {inc,Value}, counter);
-update(_, Value, Type, {_, Name}) ->
-    folsom_metrics:notify_existing_metric(Name, Value, Type).
-
-reset(_, _, _) ->
-    {error, unsupported}.
-
-get_value(_, Type, {_, Name}, DPs) ->
-    exometer_folsom:get_value(Name, Type, [], DPs).
-
-sample(_, _, _) ->
-    {error, unsupported}.
-
-setopts(_, _, _) ->
-    ok.
-
-delete(_, _, _) ->
-    {error, unsupported}.
-
-get_datapoints(Name, Type, _) ->
-    exometer_folsom:get_datapoints(Name, Type, []).
-
-options(history, [Size]) ->
-    [{size, Size}];
-options(histogram, [SampleType, SampleSize, Alpha]) ->
-    [{sample_type, SampleType},
-     {sample_size, SampleSize},
-     {alpha, Alpha}];
-options(duration    , [SampleType, SampleSize, Alpha]) ->
-    [{sample_type, SampleType},
-     {sample_size, SampleSize},
-     {alpha, Alpha}];
-options(meter_reader, []) -> [];
-options(spiral      , []) -> [];
-options(meter       , []) -> [];
-options(gauge       , []) -> [];
-options(counter     , []) -> [].
diff --git a/src/riak_core_membership_leave.erl b/src/riak_core_membership_leave.erl
index 5372ab314..e1553c320 100644
--- a/src/riak_core_membership_leave.erl
+++ b/src/riak_core_membership_leave.erl
@@ -129,7 +129,7 @@ check_balanced_or_wanting(Ring) ->
 %% although this may result in a large number of transfers
 -spec attempt_simple_transfer(transfer_ring(),
                                 term(),
-                                random:ran(),
+                                rand:state(),
                                 [{integer(), term()}],
                                 [term()]) ->
                                     {ok, transfer_ring()}|
@@ -159,7 +159,7 @@ attempt_simple_transfer(Ring, ExitingNode, Seed, Owners, Members) ->
                             pos_integer(),
                             term()},
                         transfer_ring(),
-                        {random:ran(),
+                        {rand:state(),
                             [{integer(), term()}],
                             [{term(), non_neg_integer()}]}) ->
                                 {ok, transfer_ring()}|target_n_fail.
diff --git a/src/riak_core_stat_calc_proc.erl b/src/riak_core_stat_calc_proc.erl
index ac242412e..4ac0a4876 100644
--- a/src/riak_core_stat_calc_proc.erl
+++ b/src/riak_core_stat_calc_proc.erl
@@ -149,9 +149,9 @@ cache_get(TS, TTL) ->
     check_freshness(TS, TTL).
 
 check_freshness(TStamp, TTL) ->
-    case (TStamp + TTL) > folsom_utils:now_epoch() of
+    case (TStamp + TTL) > now_epoch() of
         true ->
-             hit;
+            hit;
         false ->
             stale
     end.
@@ -166,10 +166,10 @@ maybe_get_stat(_Stat, From, Pid, Awaiting) ->
 do_calc_stat(Stat) ->
     ServerPid = self(),
     spawn_link(
-      fun() ->
-              StatVal = riak_core_stat_q:calc_stat(Stat),
-              gen_server:cast(ServerPid, {value, StatVal, folsom_utils:now_epoch()}) end
-     ).
+        fun() ->
+            StatVal = riak_core_stat_q:calc_stat(Stat),
+            gen_server:cast(ServerPid, {value, StatVal, now_epoch()}) end
+        ).
 
 maybe_tag_stale(Value) ->
     case Value of
@@ -180,3 +180,5 @@ maybe_tag_stale(Value) ->
             iolist_to_binary(V)
     end.
 
+now_epoch() ->
+    os:system_time(seconds).
\ No newline at end of file
diff --git a/src/riak_core_tcp_mon.erl b/src/riak_core_tcp_mon.erl
index 4e6e9086e..a429cef1c 100644
--- a/src/riak_core_tcp_mon.erl
+++ b/src/riak_core_tcp_mon.erl
@@ -455,14 +455,30 @@ nodeupdown_test_() ->
 ssl_test_() ->
     %% Test depends on self-signed certificates
     %% Certificates generated with:
-    %% openssl req -x509 -newkey rsa:4096 -keyout site1-key.pem -out site1-cert.pem -sha256 -days 3650 -subj "/CN=site1.basho.com" -nodes
-    %% openssl req -x509 -newkey rsa:4096 -keyout site2-key.pem -out site2-cert.pem -sha256 -days 3650 -subj "/CN=site1.basho.com" -nodes
+    %% openssl genrsa -aes256 -out ca.key 4096
+    %% openssl req -x509 -new -nodes -key ca.key -sha256 -days 3650 -out ca.crt -subj '/CN=ca.basho.com'
+    %% 
+    %% openssl req -new -nodes -out site1.csr -newkey rsa:4096 -keyout site1.key -subj '/CN=site1.basho.com'
+    %% openssl req -new -nodes -out site2.csr -newkey rsa:4096 -keyout site1.key -subj '/CN=site2.basho.com'
+    %% 
+    %% openssl x509 -req -in site1.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out site1.crt -days 3650 -sha256
+    %% openssl x509 -req -in site2.csr -CA ca.crt -CAkey ca.key -CAcreateserial -out site2.crt -days 3650 -sha256
     {timeout, 60, fun() ->
         ssl:start(),
         % Set the stat gathering interval to 100ms
         {ok, TCPMonPid} = riak_core_tcp_mon:start_link([{interval, 100}]),
         % set up a server to hear us out.
-        {ok, LS} = ssl:listen(0, [{active, true}, binary, {certfile, "test/site1-cert.pem"}, {keyfile, "test/site1-key.pem"}]),
+        {ok, LS} =
+            ssl:listen(
+                0,
+                [
+                    {active, true},
+                    binary,
+                    {certfile, "test/site1.crt"},
+                    {keyfile, "test/site1.key"},
+                    {cacertfile, "test/ca.crt"}
+                ]
+                ),
         {ok, {_, Port}} = ssl:sockname(LS),
         spawn(fun () ->
             %% server
@@ -478,7 +494,19 @@ ssl_test_() ->
             ssl_recv_loop(SslSock)
         end),
 
-        {ok, Socket} = ssl:connect("localhost", Port, [binary, {active, true}, {certfile, "test/site2-cert.pem"}, {keyfile, "test/site2-key.pem"}]),
+        {ok, Socket} =
+            ssl:connect(
+                "localhost",
+                Port,
+                [{active, true},
+                    {customize_hostname_check,
+                        [{match_fun,
+                            fun("localhost", {cn,"site1.basho.com"}) -> true end}]},
+                    {certfile, "test/site2.crt"},
+                    {keyfile, "test/site2.key"},
+                    {cacertfile, "test/ca.crt"}
+                ]
+                ),
         riak_core_tcp_mon:monitor(Socket, "test", ssl),
         % so we have stats to see
         lists:foreach(fun(_) ->
diff --git a/src/riak_core_tracer.erl b/src/riak_core_tracer.erl
index 4e06f6ec8..ce3e32664 100644
--- a/src/riak_core_tracer.erl
+++ b/src/riak_core_tracer.erl
@@ -27,6 +27,7 @@
          filter/2,
          collect/0, collect/1, collect/2,
          results/0,
+         stop_and_clear/0,
          stop_collect/0]).
 -export([test_all_events/1]).
 
@@ -107,7 +108,7 @@ handle_call({filter, MFs, Filter}, _From, State) ->
 handle_call({collect, Duration, Nodes}, _From, State) ->
     cancel_timer(State#state.stop_tref),
     Tref = timer:send_after(Duration, collect_timeout),
-    dbg:stop_clear(),
+    stop_and_clear(),
     dbg:tracer(process, {fun ({trace, _, call, {?MODULE, trigger_sentinel, _}}, Pid) ->
                                  gen_server:cast(Pid, stop_sentinel),
                                  Pid;
@@ -161,7 +162,7 @@ handle_call(stop, _From, State) ->
     {stop, normal, ok, State}.
 
 handle_cast(stop_sentinel, State) ->
-    dbg:stop_clear(),
+    stop_and_clear(),
     case State#state.stop_from of
         undefined ->
             ok;
@@ -183,6 +184,15 @@ terminate(_Reason, _State) ->
 code_change(_OldVsn, State, _Extra) ->
      {ok, State}.
 
+
+-if(?OTP_RELEASE >= 25).
+stop_and_clear() ->
+    dbg:stop().
+-else.
+stop_and_clear() ->
+    dbg:stop_clear().
+-endif.
+
 %%%===================================================================
 %%% Internal functions
 %%%===================================================================
diff --git a/test/ca.crt b/test/ca.crt
new file mode 100644
index 000000000..db8ce8e42
--- /dev/null
+++ b/test/ca.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFDzCCAvegAwIBAgIUYQ85PFznzvyEToNnKweLLgSiz5EwDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMY2EuYmFzaG8uY29tMB4XDTI0MDUwMjEwMDEzMVoXDTM0
+MDQzMDEwMDEzMVowFzEVMBMGA1UEAwwMY2EuYmFzaG8uY29tMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEA2KTXG3parK7BtTOCgTLUgfVdP2gd3leyeidr
+l5CM3svnqpiBFGaLU1Tt0Civu6z4c/CEo4JmsFlAVpPXau9K/jjKdq+VfjZF7PTa
+Oj0qAjrNFsPTGDwiVsMVjS0h9XQ9wcS75AcwpFyef3Pblarw8Ag6ACa6SR2HJLkE
+Wb495W+Ar0k5Nols+MsXstYL3M4ctwCe5XwMjkfy3lHYdr1kBbBcSHTwda/kAgkL
+zHrXYjo44y9r4pKN62cd3xKa9yMyYukz01FZJvOD7OaCbuu3NPBQ5HGuHWHYmCKR
+tahn2k5VIB68R7SFNq/2GaDKIcOq9NLe4SQqaUxt6PfTl8e85jmuHyQNHUHOT31N
+c3/OJ98mr1xZczPjY7lKN1JqEC5w8g69ECdmqEoLnLL8/xr3p+B2XlDfXns1Y6kU
+VhyhAeczno49gD72YVOXVjCpycYMtPVY+DcYIAfEyCWF9IEpTakEGnd9OZ7ZYr8P
+GqPBB3H2n3nB/XmDsI91S0vCaqv2UrroSxs+u0PA0fTSYqCxiXR2pLt8/+ECfnFk
+1h+pVmr5I4LawSbnqzL7JreIBNrfqlo8bH1jLp1sKXDcfmpnc0rSeb0Bq4eNfGA6
+aPvOuSkLv4ZZZDsJt5r+bwqW9fsI6ITm+E7ksnKDF3NJq5YoHk8CZ4TonI5G5koR
+kb2rhRUCAwEAAaNTMFEwHQYDVR0OBBYEFFU+rheh4ScB3h2CyNgLtf5L5CITMB8G
+A1UdIwQYMBaAFFU+rheh4ScB3h2CyNgLtf5L5CITMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggIBAHD/xdApZ7ORxnAeJQRnCSx4jlJ1Qy1XPwkSgp4y
+Dn0dJeItuNGSFXaA8DzFl6hsQK4CFCRqu0k/2VPoQnBohAcfFVSpb8GHXppCPs5r
+Lvax8s4RnOvvzC/Tpy1ejTI7l3cbxiwFaHWgR5z2QqY8mISBPwfgWkc9KGClyei6
+nu47PjTQpuI4EvnKE/SFNVwX7/3nX2KlrWa8ByYwkfYYw6zY4/zmHKE3A16tUKXy
+evjDUMjjCFe9DgI7s/eOoANAb6bwfH2v0ygOrETvui+iV5vdaaRJPXbKFm1Axt8a
+yaD0z1yOLL0Lps3BScw970LWs0YWQXmEnBO0knkBCyYx3K30QGXIFAUyaMhhG6iG
+QDYu7uP8yynjsEtgWQm4MKeAGgl1MsBuHQ4QTAgEYXrz6VXpsAkTdSDX5TRUWkNI
+LpZA1t4oA+LOd7DSxDHSMBdbVeNGpt13AkGoLldkC6vQfLCATgHQOSdoTBgZ5Ws+
++1D1Nscs/5E53O4KMokuuuL5gCQj6csGNcSCjZ+8pKT8EKoA3am+z+QNeKyghrdW
+9fYekKEfLfaCFtHqoEhAaIv0JO9YmHDT3h1GqemW84WWpz3mfFhIgj54xzUgdImq
+iuf3n5sjWE4tmCH3EmI+5Ze/iyArOBe5krg5ac8DbAMnj5jDjKs0guXVzacDM+Ni
+ugZi
+-----END CERTIFICATE-----
diff --git a/test/site1-cert.pem b/test/site1-cert.pem
deleted file mode 100644
index 12695cfd4..000000000
--- a/test/site1-cert.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFTCCAv2gAwIBAgIUXOs9PZNqebgYxs8u5wNrl0wnPGgwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2l0ZTEuYmFzaG8uY29tMB4XDTIzMDMxNDEwNDM1MloX
-DTMzMDMxMTEwNDM1MlowGjEYMBYGA1UEAwwPc2l0ZTEuYmFzaG8uY29tMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAku5lAk+VHXw128wmXnA9dPUtNTbQ
-V1/Q7OQNLmjGGCazZJZJL9o3yDIWzrKaPq6qN8LuKov4irx5orcXPaKvGh2RW626
-ssxWFtQtdn9qheNbKBpo2RGb1YxkSD8+0n3zz9XyTj3/tI8a9rZzTGz09P/TZ6pc
-jvPjaBve2T7V+2r1+G+lzVU/K9jrzBoV5tTP041Sl2QpJjuo78YWnuWoJedE6nez
-kXzTJtKtZvz0IujKuWdhhCSW6l3bZDB5qUDUuqjFRRBuCv8Me6mzOgubD8x7Kn+A
-m//yPEPOsVB3SbC46VNP3aRqqDPDMOuVendP5gCDGhbYpOzDd02l1nBt/VQtJEjq
-Gj2RtOoeqcYuNE51tjgdFrRsQqWOwvywkacvBtx+T8t0L4C3sfbybNFF1Q0WeKds
-n2+7XYHuvPqvgJoFduI42GZ3mYqJET9a9pNwAMjKtDxGUq3YCOuzNukeLykR1zAs
-RR2U6tejk7PFJ/7/MI/AzYfkEKhzDmkcCMk+89fSU4pwcSQ+kOr7I8+xTwblUV1n
-EJf9Ri0PT6Ep2i0vj90QQ68Ssjtw9aG4AUpYyc9SSK6hiosyXM49yR+5IKF9XCw8
-+xVLQFBC5by4FfynfgHQH7e+UvZCAjZFRVg/mYL++6T0HMsmCbmLK0wSAX2xIGcS
-V3Xhys6Kga5wRLkCAwEAAaNTMFEwHQYDVR0OBBYEFL2FKlZcj32OvROMOaY3SctH
-9mBIMB8GA1UdIwQYMBaAFL2FKlZcj32OvROMOaY3SctH9mBIMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAFutixNahjty9VHU10eI2jHC4w3H+L6c
-PVI6rft3007JWW8d+r4J+l/aGx8x+tzMTuj+ftD2rBAZ32knVC2FvPHcwSuwYMlD
-d7Of2KpWod+Bg3vqZCQg+5lwteJHE09cfN8zColP5oJB+7X459qKwDndhBR1FhL7
-kiWnSpLus7xM9XcFAOYvGkMjWxD/h77CNA7m9eQ97sZyFUUwuz56hjfGDRFeKFSy
-GHfDQNgG5zL5ctfRuB+P1IWIbND7244AtMqi/HGo66D3XnVXQG1FqrpokglUvwft
-YSb2XTHaJR8CewN/VjQUGeVx8mP3vTgsPs4k93lqCE+FiMxA+XCTULEk+HG0UXJz
-P1ZknLs2F8m96vUL5QUpV9kPwZAe7aujIuLBXTmJX1PnIdGfKwgTHJ6xXSrDOQQI
-ub3LrCl5xZmph9n2jQYOoioHIpza2HSyXOYeRWJjWbcLRSSpTWSN4TbqT1lL6ZHZ
-44LMuV83kVzYaftpkoihgyaC6KvoDhwgLZQlQqf2Z5DE3aewihShmh1pczYyXIlo
-LiQlQ00c1ZZ6mFcmuffIslZE9CxWEjyHfjgN4l6TiF1ev8Mde9Yn72e0idkZ2HiN
-1aSPj7EfgZtNxUrRay+8hJxm5Sfg1dA1ZfWLAYkM3b5oHiv1f8D6HlBp7ZNbmY5m
-VyWWe0yj710d
------END CERTIFICATE-----
diff --git a/test/site1-key.pem b/test/site1-key.pem
deleted file mode 100644
index 3c781140e..000000000
--- a/test/site1-key.pem
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-7kkoN2U3e6+/P7MS8sIo+dT5/2uI
------END PRIVATE KEY-----
diff --git a/test/site1.crt b/test/site1.crt
new file mode 100644
index 000000000..7dda2921f
--- /dev/null
+++ b/test/site1.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFATCCAumgAwIBAgIUW463AaxnTtXRHze92w2WDlAUBk0wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMY2EuYmFzaG8uY29tMB4XDTI0MDUwMjEwMDQyMVoXDTM0
+MDQzMDEwMDQyMVowGjEYMBYGA1UEAwwPc2l0ZTEuYmFzaG8uY29tMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyf1Qr18WRNAUrkyXW6zZFmC/UTStD2Yc
+Vcr4MuVd7AADC1vFUJrZSRzfTbBuTffc95tP8THCzbA5JBqGaGum0DVV/RfNziUf
+i6qSuA1MA7Kgozj5nm1Vb5hE9/YZnZaf2Vsvjt0B8v0bYtGPJtFAOKbgDGH0sKti
+jgctwp+XqNpcfoP15I06XPNkglpQ5JEoULgD6Gtt0rjweGQ/vZPj7YNqQtiIClzX
+uSqk+GQ+7Q4T272XRJBEHc4IqTFlb0EMjM+RlSQuP9SCbRV6OKa/eNsG5G9Rg1dd
+6R6Sp5WkUeU+VdTZWaHLxiztPr8zjjuTzh7KZJiMMY7eEjsLaBRxnyyLHKWkOunG
+zSzYj4w1y9hm1jQkDbzvDHRhwtj8w9UfWhA0RW2AhdaNMDdTMwZk/OAGdXco10uB
+Y2+r4/K7cqJjRKW+VL1Rk4IFM2sQUSihusE7MZMYtIdE+PedZej1HZK0xuzUeTsq
+9Xz0saoPVxIaPxSKa5lKoEncg8kSqOZiF1Y/yOXy62jBWGVAHUZL/vYVu2qRLzoM
+vvBu8f9JXXUzC+9ltqI3F7exGBf8arU0bKeRLxVn/7oBBKfCDcQAjWAn5FH+an9n
+Lany+xAUY5mn6kBZoS2cmNmplzUsDaNZyYrmgOGtgZjjh0Jav91TllLG1/P20pS6
+H01kNR06VgsCAwEAAaNCMEAwHQYDVR0OBBYEFLXWHDUY4PFdAmwy65yF1r+V0UQP
+MB8GA1UdIwQYMBaAFFU+rheh4ScB3h2CyNgLtf5L5CITMA0GCSqGSIb3DQEBCwUA
+A4ICAQAZqXQjhDFInu0PhLO8O8D0EeY0XcZommcwP1VINT8tEILZcFJAxXfuCvez
+QmKjFpYUFjwpcIJGVE+EjvDaWZgCEMfY7iJxZ/fqKENCHVOK8u9ZU8JmkZMmBDoB
+wqkIIISZVqLZIxdiFMk+kIw1QmdL6T0CxAUtJnGSeDFbR4qcIyhZc0LcJPhlg2kk
+sgKwL21BbWQ7vqeonEVFWo1/G6eswdnXus52dz05xwqquLmZy0zmCzb4mQISYtfT
+QELOiBZWFdg0dxdesnfzPjuX8emgHUC7/O3zfD0Uyp7bOkoXSOzNPVYJ5w9lXlap
+AwZ9hdZzau7zhoSecpiJDiOmKi9xLHavoH/ln8OXUIxtk5iE7hlpE4LvXGB3Jux7
+MX4MyNvAZX8+eraLQwoHkCG7y5zG7dwXtDul8CWoTpnnGEbieIqC3jxoRVQDVAWq
+tfUVGX7kXZDgKoZ8AdS2AUJx4GQ/7SoCrrEoahWz2VI5F5OjpzZNagHlT2PjAgnF
+JDsBiJJfat6C2/ZZ0vEpxGqrUCQ8nPKEGCSC9Pl4w8BNdco99w/mQwhR4HIm/6gM
+s2slQ5jBLAggvFSdp+Zq+7CM3nrhaBthpk1lQC/QQLDWxaZZeE89kla5kKccSIFA
+RPbhGZ/ctne+6pTMN3OwYUCSj/e7aplHdd/Xsj9jgnmVb4ncAQ==
+-----END CERTIFICATE-----
diff --git a/test/site1.key b/test/site1.key
new file mode 100644
index 000000000..9d805c79a
--- /dev/null
+++ b/test/site1.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+9SEazQVojYtTZTGRcb+PucvOCeLp9PY=
+-----END PRIVATE KEY-----
diff --git a/test/site2-cert.pem b/test/site2-cert.pem
deleted file mode 100644
index e01ee815d..000000000
--- a/test/site2-cert.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFTCCAv2gAwIBAgIUWcZfOUg/E6MwI0bAsYLpB4tp+BEwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2l0ZTIuYmFzaG8uY29tMB4XDTIzMDMxNDEwNDQxM1oX
-DTMzMDMxMTEwNDQxM1owGjEYMBYGA1UEAwwPc2l0ZTIuYmFzaG8uY29tMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA+BwBP5wesN6nxSN3u8nGqq6mhBDW
-xGwKBQRRC1gYWGSkxDgv6khYKmIBUDYSVo0199B7PXrAnXoHyiJgiNps08EF5tWS
-CUQA/UXsMGvImKenPYI3Wfx89y3Ie+u/ibdCVj2ZDwIu4fOOODdkznerVptkHuJ9
-s7H/6Zs6KKZV54b2GJBEFXAJMTcdo2vRnUIRUXsn5pJUajkq1FVdTscvEDB29doF
-df0e3oPNWsE4c77Q/v4ZS/NUw/msHm5GWGUJRqzWqj+HIZnB0B+v4LKWqPAkS9Jz
-FjxUPP9ZBk8wbJmWVDgdxqW9LGJGctmNifnVxfHqOAb0ZK9uanr8LZ5vxhOxD0NN
-ivSMpnt8tuxN4Xm51QolSy9pgd6D8vqjnAt5u+zDdvJF14rvb35z3N1nYsyOQxJ6
-YncwEQ/sjELSmdO/OH3VAhLM0C+iWEYo0iRR1ZTMhTLFuIY79P2RFJh3RjsfjXjf
-X4A2gxvXfOLK3GW2umKG8OEe641HfNNGFhSsJnDjtc7yTbqwk38g6MaT/OEY3goK
-1mO/UkMF8xTOrrS0rE71BZjp5tJwvrYhJwZUIYOrim8oYU8T3zKGeSVIZn9o7MWZ
-16WOgW5D9HvIBgY/C2kvXn63Qa8G4cBfsCPWMCV6VgF/dmvvFPAuhEDzDmFfyPZY
-tUzO28hebK7sPv8CAwEAAaNTMFEwHQYDVR0OBBYEFN6yWPVSHY8j4/OhpCxdL1S7
-fcYkMB8GA1UdIwQYMBaAFN6yWPVSHY8j4/OhpCxdL1S7fcYkMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAIAHYeji3dokWJh/QtrCJ7xe/8FKXZ/d
-gElkV2y6QbSYGxumUO0xlK1eNvL++lCoCOV13PK3XUHpIX5CuZuCFeigU0V3xXs8
-Cpb5WhsBW7W8h8SIXe/cPsU9X2dRcLydorXbgt8s+Z+TpVJ16K974u1d5Mxs8uqd
-ERiUB0cmMywXOLQ319bwwRm+aY7AkTBgVhQJ57os9p3iAIvMGabmJ65PH4LWM9ly
-IfwVahXpfY2DHCOyBKoi0FxCR/ltwfYi8SshswphTDP33p4h4mlHPlpIPr2UAet1
-2/38gsgtBaQBkIiKYX5J9bnVs9frGNl4jTEum7VnMUZwpUZnrYGQ2iMITIHIvGJZ
-nZcw+xBSTkOuwb6vYhOztCag5GrtQ90SJHTsIMpPs1DoJFC5nNfvSI0qVZVwD+2K
-MhVkp4ik43qOLXCykcOvZi0VSQpm6iWwATOY6K05gVCdR05rVHdkVDL6nRR4t9Ms
-ZC/PkQ5TrdEptbOCzirr/VTNW+c4nsDFYTQU3YJFB4nGSp2Q+l0BVS4wYMWfDwpA
-T1nPgT3C/Bw5p1X+Zz8rEGviyWokbzMgzqgdee1JYlHDvO1jaVp2BnPxe4eRpfYC
-EcEPiiXzUlDxCSaZ//YtancJI4tHnydykcd0tWpFyiK7RSnsUzNobiRzJidmV211
-VGEetd9c7w5Q
------END CERTIFICATE-----
diff --git a/test/site2-key.pem b/test/site2-key.pem
deleted file mode 100644
index 1c20c73d0..000000000
--- a/test/site2-key.pem
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-Cg8Qq4BDEa41SASgce8o8D5MYH69vQ==
------END PRIVATE KEY-----
diff --git a/test/site2.crt b/test/site2.crt
new file mode 100644
index 000000000..81107dd2d
--- /dev/null
+++ b/test/site2.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIFATCCAumgAwIBAgIUW463AaxnTtXRHze92w2WDlAUBk4wDQYJKoZIhvcNAQEL
+BQAwFzEVMBMGA1UEAwwMY2EuYmFzaG8uY29tMB4XDTI0MDUwMjEwMDQ0MVoXDTM0
+MDQzMDEwMDQ0MVowGjEYMBYGA1UEAwwPc2l0ZTEuYmFzaG8uY29tMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqoIL+FqNpRJ6334ZeIN0qMaaGuJjVAC0
+tjR2+Q6i4oEQnpejjs5PlHz23x0/r2oknt8gRkwdbjbrPAbGduQq4hrdPZgBpsD3
+3vCKb6C04oX0MZsGsQihCxbOqxAKWzP2R1dB4w5zUtrcsmPipvKkSyZdUulaNgdg
+W/sUSlaHuG3v2S6hIzHhKNzdRuxN+GjfuYjncFnU42i179n+qwwLuqR+7cA/NJON
+KnzQGJ4+zwLKUz0UASSc+maO2WzlmTXa9eAAD2TWSow49BEj3s4p7zZAlwOgxwn2
+3ROZWBZAZjrEPJareG34fsbrfsrJB4NhBXe+m2OKahwwAiBYpwmqiKOxtoVacRug
+tlEklPtRxlSRyZstw8ICdhUG3PKkfKcYhk8zntlhqpbXfDWNlaSvMyIWo4U9WO/5
+h5jNvm27QxbkNNN5q8yvxAMCKHZprDOYnm5Immtgqomm9ICTf8/buoxvMoAv6aET
+oz3d2713Nj6laRHrKLCDHjYCRQuwrGvbcg9PCN67BMNgj5kAPUWBTfN3aLJKBF8a
+oOfCW2TdxO2p/oDzaHHveEenzDUquBhV2mJ12XVKPgbw/ScHaVLO2OTizpte1zDC
+rRnOdAtuQZqYg83rQTlqLkMUBinM7G1TC/ON7F9sK38+4em7HpTTCrtIJeENMDnB
+5GGI/g7tY5sCAwEAAaNCMEAwHQYDVR0OBBYEFGIAkVPXLcpO02cM/s69EanjILFe
+MB8GA1UdIwQYMBaAFFU+rheh4ScB3h2CyNgLtf5L5CITMA0GCSqGSIb3DQEBCwUA
+A4ICAQB8wpfkT5dVHxcAt7PffwKteu+7MSVcbJZv4UsuEipU/oNEFW7pfDiZnZcN
+VNnTpev5t8L/SOWU8Sj3PSoEeJMPRXBLeqvG51TEg6E9RWb2olREiXBuwlJbq4A7
+N3U9rwEXspkb0ddxgpYw5xlf6OhzTBxZqhkE8EwMV/nuDcreccS+YA3++48NlyL7
+5QGv2qGn0UM0jxReIwfaN03jTcwxql4UxInWynKQ1ZTm0T35HEep9ocGO7OpOGkH
+J6B6gs+eKHRf7mX3R3hqJfXOBYyKKCebtY7Fj2rY8pgtmDKWWYluO31S0iAL5X9j
+NYDW3ZlooSUWRo4L+kbbVWX3TdP2RwGfxvD7zWpUf0H305T7pTuNQydtZO7ik5Hb
+qVVmgk0CtzkhjwrO+r9k2dCTKrLaySSp0A9Y1sMExNYKflLEitwoaA56Iy29ipC/
+HGUSf6QBf7tDrz3GbLo+r4G6JJfpdcsLWp8aqen1wCuO4/DaL1shj9X63pdC+8/V
+NPF63RvurszMbyJ9vVq5SEMIgKJxbIGbWTVpuUm/siJrgB9rT0HkMUO1yt1Mgcc0
+kq9qUn4IoNwmmsrYM9ofMOyHFykWsr7DXl6r1oibd4y3iSKYyeVfmbYkHopPzX4d
+gW040b9DnSs2tYUxgTH09P0KweD372qP0czaSodayJWsdEA7JQ==
+-----END CERTIFICATE-----
diff --git a/test/site2.key b/test/site2.key
new file mode 100644
index 000000000..86b61610a
--- /dev/null
+++ b/test/site2.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+g4pIsthXV7yviVptMMFYgSEjOnjS4w==
+-----END PRIVATE KEY-----