diff --git a/.github/workflows/release_gem.yml b/.github/workflows/release_gem.yml
index 1c56b17..face80a 100644
--- a/.github/workflows/release_gem.yml
+++ b/.github/workflows/release_gem.yml
@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '2.7'
+        ruby-version: '3.1'
     - run: "bundle install"
-    # - name: Test
-    #   run: bundle exec rake
+    - name: Test
+      run: bundle exec rake
 
   release:
     needs: test
diff --git a/.github/workflows/test.yml.hangs b/.github/workflows/test.yml
similarity index 57%
rename from .github/workflows/test.yml.hangs
rename to .github/workflows/test.yml
index daf37a2..b8211da 100644
--- a/.github/workflows/test.yml.hangs
+++ b/.github/workflows/test.yml
@@ -4,16 +4,12 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: "ubuntu-latest"
-    continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
       matrix:
-        ruby_version: ["2.2", "2.7"]
-        experimental: [false]
-        include:
-          - ruby_version: "3.0"
-            experimental: true
+        ruby_version: ["2.7","3.0","3.1"]
+        os: ["ubuntu-latest","windows-latest","macos-latest"]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
diff --git a/lib/pact/mock_service/interactions/interaction_mismatch.rb b/lib/pact/mock_service/interactions/interaction_mismatch.rb
index ae289c7..61249b1 100644
--- a/lib/pact/mock_service/interactions/interaction_mismatch.rb
+++ b/lib/pact/mock_service/interactions/interaction_mismatch.rb
@@ -56,7 +56,7 @@ def to_hash
           def to_s
             [
               "Diff with interaction: #{candidate_interaction.description_with_provider_state_quoted}",
-              diff_formatter.call(diff, {colour: false})
+              diff_formatter.call(diff, **{colour: false})
             ].join("\n")
           end
 
diff --git a/pact-mock_service.gemspec b/pact-mock_service.gemspec
index ae28fef..146fc0e 100644
--- a/pact-mock_service.gemspec
+++ b/pact-mock_service.gemspec
@@ -26,7 +26,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'thor', '>= 0.19', '< 2.0'
   gem.add_runtime_dependency 'json'
   gem.add_runtime_dependency 'webrick', '~> 1.3'
-  gem.add_runtime_dependency 'term-ansicolor', '~> 1.0'
   gem.add_runtime_dependency 'pact-support', '~> 1.16', '>= 1.16.4'
   gem.add_runtime_dependency 'filelock', '~> 1.1'
 
@@ -34,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
   gem.add_development_dependency 'webmock', '~> 3.4'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'fakefs', '~> 0.4'
+  gem.add_development_dependency 'fakefs', '~> 2.4'
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport', '~> 5.1'
   gem.add_development_dependency 'faraday', '~> 0.12'
diff --git a/spec/features/administration_endpoints_cors_spec.rb b/spec/features/administration_endpoints_cors_spec.rb
index da23c4a..833f603 100644
--- a/spec/features/administration_endpoints_cors_spec.rb
+++ b/spec/features/administration_endpoints_cors_spec.rb
@@ -108,8 +108,8 @@
 
       context "when the Origin header is set" do
         it "sets the Access-Control-Allow-Origin header to be the Origin" do
-          options '/pact', nil, { 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'X-Pact-Mock-Service, Content-Type', 'HTTP_ORIGIN' => 'http://localhost:1234' }
-          expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:1234'
+          options '/pact', nil, { 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'X-Pact-Mock-Service, Content-Type', 'HTTP_ORIGIN' => 'http://localhost:8888' }
+          expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:8888'
         end
       end
     end
diff --git a/spec/features/log/mock_multiple_responses_spec.log b/spec/features/log/mock_multiple_responses_spec.log
index a930e5c..2b15a5a 100644
--- a/spec/features/log/mock_multiple_responses_spec.log
+++ b/spec/features/log/mock_multiple_responses_spec.log
@@ -209,8 +209,10 @@ Missing requests:
 	GET /alligators
 
 
+
 WARN -- : Missing requests:
 	GET /alligators
 	GET /alligators
 
 
+
diff --git a/spec/features/log/mock_one_response_spec.log b/spec/features/log/mock_one_response_spec.log
index 31bcfa7..c1e975c 100644
--- a/spec/features/log/mock_one_response_spec.log
+++ b/spec/features/log/mock_one_response_spec.log
@@ -111,8 +111,44 @@ WARN -- : Verifying - actual interactions do not match expected interactions for
 Incorrect requests:
 	GET /alligators (request headers did not match)
 
+Diff with interaction: "a request for alligators" given "alligators exist"
+Diff
+--------------------------------------
+Key: - is expected 
+     + is actual 
+Matching keys and values are not shown
+
+ {
+   "headers": {
+-    "Accept": "application/json"
++    "Accept": "application/xml"
+   }
+ }
+
+Description of differences
+--------------------------------------
+* Expected "application/json" but got "application/xml" at $.headers.Accept
+
 
 WARN -- : Incorrect requests:
 	GET /alligators (request headers did not match)
 
+Diff with interaction: "a request for alligators" given "alligators exist"
+Diff
+--------------------------------------
+Key: - is expected 
+     + is actual 
+Matching keys and values are not shown
+
+ {
+   "headers": {
+-    "Accept": "application/json"
++    "Accept": "application/xml"
+   }
+ }
+
+Description of differences
+--------------------------------------
+* Expected "application/json" but got "application/xml" at $.headers.Accept
+
 
diff --git a/spec/features/mock_interactions_with_cors_spec.rb b/spec/features/mock_interactions_with_cors_spec.rb
index 3bbdd81..ed51ec8 100644
--- a/spec/features/mock_interactions_with_cors_spec.rb
+++ b/spec/features/mock_interactions_with_cors_spec.rb
@@ -56,21 +56,21 @@
         expect(last_response.status).to be 200
 
         # OPTIONS request from the browser for the request under test
-        options '/alligators/new', nil, { 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'accept', 'HTTP_ORIGIN' => 'http://localhost:1234' }
+        options '/alligators/new', nil, { 'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'accept', 'HTTP_ORIGIN' => 'http://localhost:8888' }
 
         # Ensure it allows the browser to actually make the request
         expect(last_response.status).to eq 200
-        expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:1234'
+        expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:8888'
         expect(last_response.headers['Access-Control-Allow-Credentials']).to eq 'true'
         expect(last_response.headers['Access-Control-Allow-Headers']).to include 'accept'
         expect(last_response.headers['Access-Control-Allow-Methods']).to include "DELETE, POST, GET, HEAD, PUT, TRACE, CONNECT"
 
         # Make the request
-        post "/alligators/new", actual_request, { 'HTTP_ACCEPT' => 'application/json', 'HTTP_ORIGIN' => 'http://localhost:1234' }
+        post "/alligators/new", actual_request, { 'HTTP_ACCEPT' => 'application/json', 'HTTP_ORIGIN' => 'http://localhost:8888' }
 
         # Ensure that the response we get back was the one we expected
         # and includes the CORS header
-        expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:1234'
+        expect(last_response.headers['Access-Control-Allow-Origin']).to eq 'http://localhost:8888'
         expect(last_response.headers['Content-Type']).to eq 'application/json'
         expect(JSON.parse(last_response.body)).to eq([{ 'name' => 'Mary' }])
       end
diff --git a/spec/integration/cli_cors_spec.rb b/spec/integration/cli_cors_spec.rb
index d985255..5d6e6d0 100644
--- a/spec/integration/cli_cors_spec.rb
+++ b/spec/integration/cli_cors_spec.rb
@@ -2,17 +2,17 @@
 require 'fileutils'
 require 'support/integration_spec_support'
 
-describe "The pact-mock-service command line interface", mri_only: true do
+describe "The pact-mock-service command line interface", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
   before :all do
     clear_dirs
-    @pid = start_server 1234, '--cors'
+    @pid = start_server 8888, '--cors'
   end
 
   it "responds to an OPTIONS request for a non administration request" do
-    response = make_options_request 1234
+    response = make_options_request 8888
     expect(response.status).to eq 200
     expect(response.headers['Access-Control-Allow-Headers']).to_not be nil
   end
diff --git a/spec/integration/cli_monkeypatch_spec.rb b/spec/integration/cli_monkeypatch_spec.rb
index e33c818..3f0dae8 100644
--- a/spec/integration/cli_monkeypatch_spec.rb
+++ b/spec/integration/cli_monkeypatch_spec.rb
@@ -2,7 +2,7 @@
 require 'support/integration_spec_support'
 require 'find_a_port'
 
-describe "The pact-mock-service command line interface with a monkeypatch", mri_only: true do
+describe "The pact-mock-service command line interface with a monkeypatch", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
diff --git a/spec/integration/cli_spec.rb b/spec/integration/cli_spec.rb
index 5bde4fb..1ffbb1d 100644
--- a/spec/integration/cli_spec.rb
+++ b/spec/integration/cli_spec.rb
@@ -1,38 +1,38 @@
 require 'fileutils'
 require 'support/integration_spec_support'
 
-describe "The pact-mock-service command line interface", mri_only: true do
+describe "The pact-mock-service command line interface", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
   before :all do
     clear_dirs
-    @pid = start_server 1234, "--pact-specification-version 3.0.0"
+    @pid = start_server 8888, "--pact-specification-version 3.0.0"
   end
 
   it "starts up and responds with mocked responses" do
-    response = setup_interaction 1234
+    response = setup_interaction 8888
     expect(response.status).to eq 200
 
-    response = invoke_expected_request 1234
+    response = invoke_expected_request 8888
     puts response.body if response.status != 200
     expect(response.status).to eq 200
     expect(response.body).to eq 'Hello world'
 
-    write_pact 1234
+    write_pact 8888
     expect(response.status).to eq 200
   end
 
   it "respects headers with underscores" do
-    setup_interaction_with_underscored_header 1234
-    response = invoke_request_with_underscored_header 1234
+    setup_interaction_with_underscored_header 8888
+    response = invoke_request_with_underscored_header 8888
     puts response.body unless response.status == 200
     expect(response.status).to eq 200
   end
 
   it "sets the X-Pact-Mock-Service-Location header" do
-    response = setup_interaction 1234
-    expect(response.headers['X-Pact-Mock-Service-Location']).to eq 'http://0.0.0.0:1234'
+    response = setup_interaction 8888
+    expect(response.headers['X-Pact-Mock-Service-Location']).to eq 'http://0.0.0.0:8888'
   end
 
   it "writes logs to the specified log file" do
@@ -40,18 +40,18 @@
   end
 
   it "writes the pact to the specified directory" do
-    clear_interactions 1234
-    setup_interaction 1234
-    invoke_expected_request 1234
+    clear_interactions 8888
+    setup_interaction 8888
+    invoke_expected_request 8888
     expect(File.exist?('tmp/pacts/consumer-provider.json')).to be true
   end
 
   it "sets the pact specification version" do
-    clear_interactions 1234
-    setup_interaction 1234
-    invoke_expected_request 1234
+    clear_interactions 8888
+    setup_interaction 8888
+    invoke_expected_request 8888
 
-    write_pact 1234
+    write_pact 8888
     expect(File.read("tmp/pacts/consumer-provider.json")).to include "3.0.0"
   end
 
diff --git a/spec/integration/cli_ssl_spec.rb b/spec/integration/cli_ssl_spec.rb
index 86e9557..549792b 100644
--- a/spec/integration/cli_ssl_spec.rb
+++ b/spec/integration/cli_ssl_spec.rb
@@ -1,7 +1,7 @@
 require 'fileutils'
 require 'support/integration_spec_support'
 
-describe "The pact-mock-service command line interface, with SSL", mri_only: true, skip_travis: true do
+describe "The pact-mock-service command line interface, with SSL", mri_only: true, skip_travis: true, skip_windows: true, skip_gha_linux: true do
 
   include Pact::IntegrationTestSupport
 
diff --git a/spec/integration/cli_with_auto_pact_write_spec.rb b/spec/integration/cli_with_auto_pact_write_spec.rb
index 948b84f..c30be7c 100644
--- a/spec/integration/cli_with_auto_pact_write_spec.rb
+++ b/spec/integration/cli_with_auto_pact_write_spec.rb
@@ -2,7 +2,7 @@
 require 'support/integration_spec_support'
 require 'find_a_port'
 
-describe "The pact-mock-service command line interface", mri_only: true do
+describe "The pact-mock-service command line interface", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
diff --git a/spec/integration/control_server_cli_spec.rb b/spec/integration/control_server_cli_spec.rb
index d38078b..b3fc158 100644
--- a/spec/integration/control_server_cli_spec.rb
+++ b/spec/integration/control_server_cli_spec.rb
@@ -16,21 +16,21 @@ def mock_service_headers
   end
 end
 
-describe "The pact-mock-service control server command line interface", mri_only: true do
+describe "The pact-mock-service control server command line interface", mri_only: true, skip_windows: true do
 
   include Pact::ControlServerTestSupport
 
   before :all do
     clear_dirs
-    @pid = start_control 1234, "--pact-specification-version 3"
+    @pid = start_control 8888, "--pact-specification-version 3"
   end
 
   it "starts up and responds with mocked responses" do
-    response = setup_interaction 1234
+    response = setup_interaction 8888
     puts response.body unless response.status == 200
     expect(response.status).to eq 200
     mock_service_port = URI(response.headers['X-Pact-Mock-Service-Location']).port
-    expect(mock_service_port).to_not eq 1234
+    expect(mock_service_port).to_not eq 8888
 
     response = invoke_expected_request mock_service_port
     expect(response.status).to eq 200
diff --git a/spec/integration/control_server_with_cors_cli_spec.rb b/spec/integration/control_server_with_cors_cli_spec.rb
index b1754d8..4fd2dbf 100644
--- a/spec/integration/control_server_with_cors_cli_spec.rb
+++ b/spec/integration/control_server_with_cors_cli_spec.rb
@@ -1,17 +1,17 @@
 require 'fileutils'
 require 'support/integration_spec_support'
 
-describe "The pact-mock-service control server command line interface", mri_only: true do
+describe "The pact-mock-service control server command line interface", mri_only: true, skip_windows: true do
 
   include Pact::ControlServerTestSupport
 
   before :all do
     clear_dirs
-    @pid = start_control 1234, '--cors'
+    @pid = start_control 8888, '--cors'
   end
 
   it "responds to an OPTIONS request for a non administration request" do
-    response = setup_interaction 1234
+    response = setup_interaction 8888
     expect(response.status).to eq 200
     mock_service_port = URI(response.headers['X-Pact-Mock-Service-Location']).port
 
diff --git a/spec/integration/control_server_with_ssl_cli_spec.rb b/spec/integration/control_server_with_ssl_cli_spec.rb
index ec04585..5e4e92a 100644
--- a/spec/integration/control_server_with_ssl_cli_spec.rb
+++ b/spec/integration/control_server_with_ssl_cli_spec.rb
@@ -1,22 +1,22 @@
 require 'fileutils'
 require 'support/integration_spec_support'
 
-describe "The pact-mock-service control server command line interface", mri_only: true do
+describe "The pact-mock-service control server command line interface", mri_only: true, skip_windows: true do
 
   include Pact::ControlServerTestSupport
 
   before :all do
     clear_dirs
-    @pid = start_control 1234, '--ssl'
+    @pid = start_control 8888, '--ssl'
   end
 
   it "sets the X-Pact-Mock-Service-Location with https" do
-    response = setup_interaction 1234
+    response = setup_interaction 8888
     expect(response.headers['X-Pact-Mock-Service-Location']).to start_with 'https://localhost:'
   end
 
   it "responds to an OPTIONS request for a non administration request" do
-    response = setup_interaction 1234
+    response = setup_interaction 8888
     expect(response.status).to eq 200
     mock_service_port = URI(response.headers['X-Pact-Mock-Service-Location']).port
     response = connect_via_ssl mock_service_port
diff --git a/spec/integration/stub_cli_spec.rb b/spec/integration/stub_cli_spec.rb
index b886d3a..dc52f20 100644
--- a/spec/integration/stub_cli_spec.rb
+++ b/spec/integration/stub_cli_spec.rb
@@ -1,6 +1,6 @@
 require 'support/integration_spec_support'
 
-describe "The pact-stub-service command line interface", mri_only: true do
+describe "The pact-stub-service command line interface", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
diff --git a/spec/integration/stub_cli_with_multiple_pacts_spec.rb b/spec/integration/stub_cli_with_multiple_pacts_spec.rb
index e88c008..1ddbc83 100644
--- a/spec/integration/stub_cli_with_multiple_pacts_spec.rb
+++ b/spec/integration/stub_cli_with_multiple_pacts_spec.rb
@@ -1,7 +1,7 @@
 require 'support/integration_spec_support'
 require 'find_a_port'
 
-describe "The pact-stub-service command line interface with multiple pacts", mri_only: true do
+describe "The pact-stub-service command line interface with multiple pacts", mri_only: true, skip_windows: true do
 
   include Pact::IntegrationTestSupport
 
diff --git a/spec/lib/pact/mock_service/app_manager_spec.rb b/spec/lib/pact/mock_service/app_manager_spec.rb
index 64dde99..24e0bbd 100644
--- a/spec/lib/pact/mock_service/app_manager_spec.rb
+++ b/spec/lib/pact/mock_service/app_manager_spec.rb
@@ -17,7 +17,7 @@ module Pact::MockService
       let(:options) { { pact_specification_version: '3' } }
 
       context "for http://localhost" do
-        let(:url) { 'http://localhost:1234'}
+        let(:url) { 'http://localhost:8888'}
 
         it "starts a mock service at the given port on localhost" do
           expect_any_instance_of(AppRegistration).to receive(:spawn)
@@ -27,7 +27,7 @@ module Pact::MockService
 
         it "registers the mock service as running on the given port" do
           AppManager.instance.register_mock_service_for name, url, options
-          expect(AppManager.instance.app_registered_on?(1234)).to eq true
+          expect(AppManager.instance.app_registered_on?(8888)).to eq true
         end
 
         it "reports the metric for pact mock service started" do
@@ -50,7 +50,7 @@ module Pact::MockService
       end
 
       context "for https://" do
-        let(:url) { 'https://localhost:1234'}
+        let(:url) { 'https://localhost:8888'}
 
         it "should throw an unsupported error" do
           expect { AppManager.instance.register_mock_service_for name, url, options }.to raise_error "Currently only http is supported"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fa20e85..94e3a7f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,11 +15,17 @@
 # Issue recorded here: https://github.com/bethesque/pact-mock_service/issues/59
 # Need to fix...
 is_travis = ENV['TRAVIS'] == 'true'
+is_act = ENV['ACT'] == 'true'
+is_gha = ENV['GITHUB_ACTIONS'] == 'true'
+is_gha_linux = ENV['RUNNER_OS'] == 'Linux' && is_gha
+is_windows = Gem.win_platform?
 
 RSpec.configure do | config |
-  config.include(FakeFS::SpecHelpers, :fakefs => true)
-  config.filter_run_excluding :mri_only => is_java
-  config.filter_run_excluding :skip_travis => is_travis
+  config.include(FakeFS::SpecHelpers, fakefs: true)
+  config.filter_run_excluding mri_only: is_java
+  config.filter_run_excluding skip_travis: is_travis
+  config.filter_run_excluding skip_windows: is_windows
+  config.filter_run_excluding skip_gha_linux: is_act || is_gha_linux
   if config.respond_to?(:example_status_persistence_file_path=)
     config.example_status_persistence_file_path = "./spec/examples.txt"
   end
diff --git a/spec/support/ssl/server.crt b/spec/support/ssl/server.crt
index 1ad80d1..60fffe1 100644
--- a/spec/support/ssl/server.crt
+++ b/spec/support/ssl/server.crt
@@ -1,18 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIC+zCCAeOgAwIBAgIJAOiUTH8B7Jc7MA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
-BAMMCWxvY2FsaG9zdDAeFw0xNjEwMjExNTIzMzNaFw0yNjEwMTkxNTIzMzNaMBQx
-EjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMJpYbxk6tFNDXqGx6UAq/xUY3KZTEYHpZri8XKvqY/43ZlUD6YkgpffhsrO
-TI/KGE7IBQ2xBiSq3+R0KjEC072Puwr10tSsyZ+qu3t8By+7PPVUtTqS6xb9KoLl
-Do9wwc5QBqq4DEjShD3RyXQfOJa67xC15D+PZmEOksG06Pq3ux+9jhJ9i94mutVX
-KuTg+C0DpqdaIJyTU7QFE5JGpf/nDmUvHGzzDnPP4wyZsAKgQv7xMdZQ5zVFv1lf
-ByGuu5EfPem8j/NWmatQSsZpyw6lJPwjse4QnCVU+brrto6FtMjvloippbHpgNVw
-P3G8x9Z+RqUofxT6TpJNCnRtwI8CAwEAAaNQME4wHQYDVR0OBBYEFHadRgrUHILs
-+tnDq/KS8qp4h3Y5MB8GA1UdIwQYMBaAFHadRgrUHILs+tnDq/KS8qp4h3Y5MAwG
-A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKQ/RCD0HLcbRlv2uicT7dRK
-/kUCVP6XSX3ZxveGIEZOLxXlESU/Qp4DvvJ0CI7KUkooPH1aExSqbx7jlbyukQxT
-ZvtDF/sOuEEAenerSfO0Eq8X9RVDWzUAEWkUetxVMLvWKeawPM5B8/mw/NCAK7Ld
-EXZyQSVSe9iU7Ugrr6S/8J93Uz2Y4wWjJOZPFN1stw5xNrBiDLdyXpQDVLjPCyVz
-NKcryDd1gjTybMyn25vx/xZZXd89p8/puIO86TU9esBLTEIh0umgkYJxZQTECVWc
-Mi+nfqmdxXPXkypvYC0xepNoBdVDaUzi9oXpdoQa2YMExW3Bj32wdukvKnIT2NM=
------END CERTIFICATE-----
+MIIDiDCCAnACCQCWW6LywpPSwjANBgkqhkiG9w0BAQsFADCBhTELMAkGA1UEBhMC
+QVUxEzARBgNVBAgMClNvbWUgU3RhdGUxDzANBgNVBAcMBlN5ZG5leTENMAsGA1UE
+CgwEUGFjdDEPMA0GA1UECwwGUHl0aG9uMRIwEAYDVQQDDAlsb2NhbGhvc3QxHDAa
+BgkqhkiG9w0BCQEWDXNvbWVAbWFpbC5jb20wHhcNMjAwNjEwMTUzOTM2WhcNMjMw
+MzMxMTUzOTM2WjCBhTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUgU3RhdGUx
+DzANBgNVBAcMBlN5ZG5leTENMAsGA1UECgwEUGFjdDEPMA0GA1UECwwGUHl0aG9u
+MRIwEAYDVQQDDAlsb2NhbGhvc3QxHDAaBgkqhkiG9w0BCQEWDXNvbWVAbWFpbC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm/BMUkuVaYwLjnoq/
+u4fFKoBGSPl3CxvSUWhzlsaM5i+UlS7ZLwXxAxw+Vba9cztSyYHNs2BCxCHUWBFe
+B818cXzQXbV0gunMz9oDxr8aQmwpRkIdxxBvmaqLbk6sjj5cTqRK39/BNtZEkZmA
+QAOggnfB7Bx/OQmh4aidT6DytjA8ur3FofAVUVXHfQohm/kJOhqcdXL5pBQqD2bh
+Ua6KPbZTsfOmFLggZmhqPZSjS+leqFagpissW/aHSyk/3c+vhXOhEbCUeCXaz7up
+/DNF/0OHF4+r2UaeonxMxC/X6NEhNYHyNPypbdC3/59Zoa2Spu2BLy8ZoChe1dRk
+hZqtAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHpq3JmhAm5t/orY4ONFxPq1iF89
+3nKsKckfcOpDF/zjS2+6I30LVByuU88BKdTt7tsRojoWXEI01YGqYWTEwerfESr9
+M16xek5h5e7XJqp9jzyX6kswel/rWB8rF93biW0v00/KKRwwIr5IDvKb4XvugzW4
+FEG+1nhXCyjrkmKV/bbCfdkBHgavaj5TPv1LoXOX7VDRjwqoM7RP/z6JJsZkxDx3
+TkXtC8Lw4LF+tpWY8nQu3/HCqwxL7Vgy4M/IvoXRePdSI6goH8ri0zFuK9pvAREK
+IjY271t+lapu8sDqUEf9tW/98YhxpBInQYBL2bEEtMYTRXRm06fSn7o3IlM=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/spec/support/ssl/server.key b/spec/support/ssl/server.key
index e6abc35..9621e48 100644
--- a/spec/support/ssl/server.key
+++ b/spec/support/ssl/server.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwmlhvGTq0U0NeobHpQCr/FRjcplMRgelmuLxcq+pj/jdmVQP
-piSCl9+Gys5Mj8oYTsgFDbEGJKrf5HQqMQLTvY+7CvXS1KzJn6q7e3wHL7s89VS1
-OpLrFv0qguUOj3DBzlAGqrgMSNKEPdHJdB84lrrvELXkP49mYQ6SwbTo+re7H72O
-En2L3ia61Vcq5OD4LQOmp1ognJNTtAUTkkal/+cOZS8cbPMOc8/jDJmwAqBC/vEx
-1lDnNUW/WV8HIa67kR896byP81aZq1BKxmnLDqUk/COx7hCcJVT5uuu2joW0yO+W
-iKmlsemA1XA/cbzH1n5GpSh/FPpOkk0KdG3AjwIDAQABAoIBAAqJa6KqVY/CfViG
-tYtb3fZvHHS5mkixYWhjpHJy0t3avyfwRmja0bkphES5qayhZ2/dp2h2j76tBDV9
-lkvRu2gqwhh1+ldMhiEBP+gRcNJFc6hYTvo9vEAiuIsfnwpnMhncfIAEOaY4wrIX
-DLQefRKuTwa41QYc34+jGpElHPt5oYtyxSq4xnX+JMgHtUcFEWzznZ354kAJHaZn
-B3uV7GaUCtON6S1EML+wzc4HjTiYB3s3XE0acU6ZLtVOR4rUyNiClEMBO+816WxP
-J7Hq9camQk3tPGuifhgUSCE9NGVnoyiGwNVlY1mnvG8a5rEPL46Z9zrjBENvU1rU
-FDYi2QECgYEA7/xpU+E/EMlmlPHNoQ7uV0CVVYfxgbV7nM6f64OhcrR4iu6lUOFX
-rdAELFP/Uy9jzovVL60xUdW3oCNOb7gxFK/N0aRb2RzJUPC5jkaTs3YZF63MGfQt
-yPA13LDCK/LJa9YsDHGOA0wb6IAttlb7OgExn+ZMXcZxV7WN1AJw+e0CgYEAz2Jx
-AwWSk2LVSAnYJZpkLp2nNnxGAoMaMAMKNbTi5SHi4XleNfunDVVE+bAlFVG0YJy0
-1gTju+3KRV/JUrgrg1PPWWsJJqlyI6r6xaWy8W0DVacrBzFQ05lGTjo10epvj0dh
-//1KSIVK2ZHZLkvrBeutGI7XlCg46Erp8tN/JOsCgYBul1oObnl6ieU89CU3eEL7
-cGag8LGpfXGGdG2bwaAP1PzLwWfrWrzl+ztBFkBOHEOZNjU68EwPEza4lCycLTxo
-9Q8a8evlpG9dXmGUIBAGnoC3ub6Zoz3KIHAh0E7ao9qQWDUaUuYHvPYLca4fHfxN
-4aj1r9I3ULCAo8jFD47yjQKBgEzcHihRi2Zmbcd6JoqhMtn4Af32hvftYOpEZidL
-eAAV1AFeuuTk9J/DZ4Hmn4fMNT7NNVRQkZqX4axeeL3Ylf/hMurf+Y9Do5LGjpRr
-+eryTRcUkqTiySLzHpRljIbVDS2b9h0q4boI9Jm4LTa0WlFibE+6uPknAxhMk3I0
-ol2rAoGBAOdsHXKQTQD6kQDUCihLBnOw6iu7iEjMDff30/JXtdKZAN8AvRjdGDAS
-R3ZWUbbyM8Ete3vNbaU+saAm3kOOcov6ZaBIsVP1ZiA/jd1We2wBUMOEqOdSCSdN
-bMZ4Iax40ZhNsxZzjbbaf25Ru/WTKYTPRF5vOFJtJB21FIZNSFrs
------END RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA5vwTFJLlWmMC456Kv7uHxSqARkj5dwsb0lFoc5bGjOYvlJUu
+2S8F8QMcPlW2vXM7UsmBzbNgQsQh1FgRXgfNfHF80F21dILpzM/aA8a/GkJsKUZC
+HccQb5mqi25OrI4+XE6kSt/fwTbWRJGZgEADoIJ3wewcfzkJoeGonU+g8rYwPLq9
+xaHwFVFVx30KIZv5CToanHVy+aQUKg9m4VGuij22U7HzphS4IGZoaj2Uo0vpXqhW
+oKYrLFv2h0spP93Pr4VzoRGwlHgl2s+7qfwzRf9DhxePq9lGnqJ8TMQv1+jRITWB
+8jT8qW3Qt/+fWaGtkqbtgS8vGaAoXtXUZIWarQIDAQABAoIBAQC3r5woz0yO3ZAN
+nSWvpZ0pwUuzGRMxhOcCEPUkfrG0mNUbrqtL0WZDLHsIYzdoXzu88TxFbbFORxSz
+/bkJ8uCJZuKf/PVxCy6MTnqMaD/OzSWgiRvI/GXoqeYC7ZypApE67NsgI/qXd1lb
+vAG7CK0ZtscvsulSjvRHBOIG/6z5dUAKnLJjr7uKydMHSIKNafKAEA6HGDCvIu4d
+J9EQzLfmpjLTkeB1DNZrv1mtNjf/kG/M/UX5a1RtOJTGvHQn/oZSUKng3DVUNBtq
+dEO6Pi5n88xWuxH6YAWqqDjCfqyey1Jc1rQxfnx6vRPL7+IaXRugAKFMFm8Xbp9/
+/9eEDCyNAoGBAPZEjYH9u2856KYUTyky8gD1TOE9gf4x4zFjK6SzBT8v1y1RdSwQ
+tf7ozj94OV/b9bAE3k/z2a09xYty5VBXs6MCluQTS67KgRaO9sSFtRmnupyBNk2z
+r3QEYuVDmJ6Dk/3ovItXqFaW8IbOZMf6Acu5aEDx4UKmb2tzGGJ7DxF/AoGBAPAc
+57p1yRWIG+hJMdkudXhBz+L3t2NbESWom33hi1mDMIKp3dwJmhA4kq+Uyqfl32uF
+Iy3z+3xr2V1BdGg1RnicfcyjHaQ4/89YB+nkOHB8muV2R57tYahOgWn6rXXxTOBs
+X2Vjd7ByAEFimrVfDH33inrYuIiI/cku4Xyj71HTAoGBAJeyrsBuPfFL6KW1SPYF
+7dDtSchNjS+6J0sa3Z18sTS1EYVW8iiMuq8lVTb/pcgIxJUCyrbRbTssG+3EfsE4
+5Oz7AVvJDwvCrjXpJtTz0BTXnzoc1giTMPb0ZL75HqA2SQlVPh9PheCg5dUEekw9
+ErIdqbynwqy9vVCg+1pel2+dAoGAR1C+fsIHFG8VottCg/fpies6HHZosIjWwfGf
+JTc9FTwCx3w+WeE8Mf8rihzOSCndPukPNtHVavH5YFpVgbH5GU+ZiZMU9ba8O9Aw
+oYZYQQixVN/Zi9mDfOK8S0baCELAC5QEjW+KmAx0CPeJbb8qTaudJLmDrYHKpttW
+u5dROGMCgYEAlgTZNiEeBAPQZD30CSvFUlZVCOOyu5crP9hCPA9um5FsvD9minSz
+yJqeMj7zapZsatAzYwHrGG6nHnTKWEBNaimR7kjTpKdKzXQaA9XeVLmeFAZ3Exad
+JDKTPI+asF+097sHUcVuloMOZXbD1uAZnvLWIwfsaHxs41AkF+0lmM4=
+-----END RSA PRIVATE KEY-----
\ No newline at end of file