diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 8b466cfb..6aaa603f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
 with:
 
 ```sh
-BEAKER_setfile=debian11-64 bundle exec rake beaker
+BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
 ```
 
-You can replace the string `debian10` with any common operating system.
+You can replace the string `debian11` with any common operating system.
 The following strings are known to work:
 
-* ubuntu1804
 * ubuntu2004
-* debian10
+* ubuntu2204
 * debian11
 * centos7
 * centos8
+* centos9
+* almalinux8
+* almalinux9
+* fedora36
 
 For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
 
diff --git a/.msync.yml b/.msync.yml
index b929160c..dd3e9572 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 98a04cfb..db21d3b5 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 9bcd4f00..ecf17a60 100644
--- a/metadata.json
+++ b/metadata.json
@@ -57,7 +57,6 @@
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
diff --git a/spec/defines/copr_spec.rb b/spec/defines/copr_spec.rb
index ca4b05ef..9cbe1e35 100644
--- a/spec/defines/copr_spec.rb
+++ b/spec/defines/copr_spec.rb
@@ -81,7 +81,7 @@
       it {
         is_expected.to contain_exec("dnf -y copr enable #{title}").with(
           'path'    => '/bin:/usr/bin:/sbin/:/usr/sbin',
-          'unless'  => "dnf copr list | egrep -q '#{title}\$'",
+          'unless'  => "dnf copr list | egrep -q '#{title}$'",
           'require' => "Package[#{prereq_plugin}]"
         )
       }
@@ -95,7 +95,7 @@
       it {
         is_expected.to contain_exec("dnf -y copr disable #{title}").with(
           'path'    => '/bin:/usr/bin:/sbin/:/usr/sbin',
-          'unless'  => "dnf copr list | egrep -q '#{title} (disabled)\$'",
+          'unless'  => "dnf copr list | egrep -q '#{title} (disabled)$'",
           'require' => "Package[#{prereq_plugin}]"
         )
       }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6515b7bf..9efb4ae6 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/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index d3a6e23c..2681792e 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -5,6 +5,6 @@
 
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-configure_beaker
+configure_beaker(modules: :metadata)
 
 Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }
diff --git a/tasks/init.rb b/tasks/init.rb
index 0ce5a7b7..4bff52a7 100755
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -17,7 +17,7 @@ def yum(action, quiet)
 end
 
 def process_list_updates(output)
-  status = output[:status].lines[1..-1]
+  status = output[:status].lines[1..]
   status ||= []
 
   result = status.map do |line|