diff --git a/.msync.yml b/.msync.yml
index b929160c9..dd3e95722 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '6.0.0'
+modulesync_config_version: '7.0.0'
diff --git a/Gemfile b/Gemfile
index 98a04cfb9..db21d3b56 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 group :test do
-  gem 'voxpupuli-test', '~> 6.0',   :require => false
+  gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
   gem 'puppet_metadata', '~> 3.0',  :require => false
diff --git a/metadata.json b/metadata.json
index a83761c38..af73891b7 100644
--- a/metadata.json
+++ b/metadata.json
@@ -95,7 +95,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "18.04",
         "20.04",
         "22.04"
       ]
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7bf7..9efb4ae62 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -17,3 +17,4 @@
     add_custom_fact name.to_sym, value
   end
 end
+Dir['./spec/support/spec/**/*.rb'].sort.each { |f| require f }
diff --git a/spec/unit/facter/util/fact_nginx_version_spec.rb b/spec/unit/facter/util/fact_nginx_version_spec.rb
index 94cff3635..70bea5dee 100644
--- a/spec/unit/facter/util/fact_nginx_version_spec.rb
+++ b/spec/unit/facter/util/fact_nginx_version_spec.rb
@@ -11,7 +11,7 @@
       allow(Facter::Util::Resolution).to receive(:which).with('openresty').and_return(false)
     end
 
-    it { expect(Facter.fact(:nginx_version).value).to eq(nil) }
+    it { expect(Facter.fact(:nginx_version).value).to be_nil }
   end
 
   context 'nginx' do