diff --git a/.sync.yml b/.sync.yml
index cbdb3b6..5edd12c 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -1,96 +1,98 @@
 ---
 ".gitlab-ci.yml":
   delete: true
 ".rubocop.yml":
   default_configs:
     inherit_from: ".rubocop_todo.yml"
     require:
     - rubocop-i18n
     - rubocop-rspec
 ".travis.yml":
   branches:
   - release
   user: puppet
   secure: ''
   includes:
   - bundler_args: 
     dist: trusty
     env: PLATFORMS=deb_puppet5
     rvm: 2.5.3
     before_script:
     - bundle exec rake 'litmus:provision_list[travis_deb]'
     - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
     - bundle exec rake 'litmus:install_agent[puppet5]'
     - bundle exec rake litmus:install_module
     script:
     - bundle exec rake litmus:acceptance:parallel
     services: docker
     stage: acceptance
     sudo: required
   - bundler_args: 
     dist: trusty
     env: PLATFORM=centos:deb_puppet6
     rvm: 2.5.3
     before_script:
     - bundle exec rake 'litmus:provision_list[travis_deb]'
     - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'
     - bundle exec rake 'litmus:install_agent[puppet6]'
     - bundle exec rake litmus:install_module
     script:
     - bundle exec rake litmus:acceptance:parallel
     services: docker
     sudo: required
     stage: acceptance
   - bundler_args: 
     dist: trusty
     env: PLATFORMS=el_puppet5
     rvm: 2.5.3
     before_script:
     - bundle exec rake 'litmus:provision_list[travis_el]'
     - bundle exec rake 'litmus:install_agent[puppet5]'
     - bundle exec rake litmus:install_module
     script:
     - bundle exec rake litmus:acceptance:parallel
     services: docker
     sudo: required
     stage: acceptance
   - bundler_args: 
     dist: trusty
     env: PLATFORM=centos:el_puppet6
     rvm: 2.5.3
     before_script:
     - bundle exec rake 'litmus:provision_list[travis_el]'
     - bundle exec rake 'litmus:install_agent[puppet6]'
     - bundle exec rake litmus:install_module
     script:
     - bundle exec rake litmus:acceptance:parallel
     services: docker
     stage: acceptance
     sudo: required
+  simplecov: true
 appveyor.yml:
   use_litmus: true
   matrix_extras:
   - RUBY_VERSION: 25-x64
     ACCEPTANCE: 'yes'
     TARGET_HOST: localhost
   - RUBY_VERSION: 25-x64
     ACCEPTANCE: 'yes'
     TARGET_HOST: localhost
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+  simplecov: true
 Gemfile:
   use_litmus: true
   required:
     ":development":
     - gem: puppet-lint-i18n
   optional:
     ":development":
     - gem: github_changelog_generator
       git: https://github.com/skywinder/github-changelog-generator
       ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
       condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
 Rakefile:
   requires:
   - puppet_pot_generator/rake_tasks
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true
diff --git a/.travis.yml b/.travis.yml
index 3ca87ec..1fe7ec9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,95 +1,95 @@
 ---
 dist: xenial
 language: ruby
 cache: bundler
 before_install:
   - bundle -v
   - rm -f Gemfile.lock
   - gem update --system $RUBYGEMS_VERSION
   - gem --version
   - bundle -v
 script:
-  - 'bundle exec rake $CHECK'
+  - 'SIMPLECOV=yes bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
   - 2.5.3
 stages:
   - static
   - spec
   - acceptance
   -
     if: tag =~ ^v\d
     name: deploy
 matrix:
   fast_finish: true
   include:
     -
       env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
       stage: static
     -
       env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
       rvm: 2.4.5
       stage: spec
     -
       env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec
       rvm: 2.5.3
       stage: spec
-    -
-      env: DEPLOY_TO_FORGE=yes
-      stage: deploy
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
       env: PLATFORMS=deb_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
       env: PLATFORM=centos:deb_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
       env: PLATFORMS=el_puppet5
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
     -
       before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"]
       bundler_args: 
       dist: trusty
       env: PLATFORM=centos:el_puppet6
       rvm: 2.5.3
       script: ["bundle exec rake litmus:acceptance:parallel"]
       services: docker
       stage: acceptance
       sudo: required
+    -
+      env: DEPLOY_TO_FORGE=yes
+      stage: deploy
 branches:
   only:
     - master
     - /^v\d/
     - release
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: puppet
   password:
     secure: ""
   on:
     tags: true
     all_branches: true
     condition: "$DEPLOY_TO_FORGE = yes"
diff --git a/appveyor.yml b/appveyor.yml
index ece8590..ffef811 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,81 +1,82 @@
 ---
 version: 1.1.x.{build}
 branches:
   only:
     - master
     - release
 skip_commits:
   message: /^\(?doc\)?.*/
 clone_depth: 10
 init:
   - SET
   - 'mkdir C:\ProgramData\PuppetLabs\code && exit 0'
   - 'mkdir C:\ProgramData\PuppetLabs\facter && exit 0'
   - 'mkdir C:\ProgramData\PuppetLabs\hiera && exit 0'
   - 'mkdir C:\ProgramData\PuppetLabs\puppet\var && exit 0'
 environment:
+  SIMPLECOV: yes
   matrix:
     -
       RUBY_VERSION: 24-x64
       CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
     -
       PUPPET_GEM_VERSION: ~> 5.0
       RUBY_VERSION: 24
       CHECK: parallel_spec
     -
       PUPPET_GEM_VERSION: ~> 5.0
       RUBY_VERSION: 24-x64
       CHECK: parallel_spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25
       CHECK: parallel_spec
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25-x64
       CHECK: parallel_spec
     -
       RUBY_VERSION: 25-x64
       ACCEPTANCE: yes
       TARGET_HOST: localhost
     -
       RUBY_VERSION: 25-x64
       ACCEPTANCE: yes
       TARGET_HOST: localhost
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
 for:
 -
   matrix:
     only:
       - ACCEPTANCE: yes
   install:
     - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
     - bundle install --jobs 4 --retry 2
     - type Gemfile.lock
   test_script:
     - bundle exec puppet -V
     - ruby -v
     - gem -v
     - bundle -v
     - bundle exec rake spec_prep
     - bundle exec rake litmus:acceptance:localhost
 matrix:
   fast_finish: true
 install:
   - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
   - bundle install --jobs 4 --retry 2 --without system_tests
   - type Gemfile.lock
 build: off
 test_script:
   - bundle exec puppet -V
   - ruby -v
   - gem -v
   - bundle -v
   - bundle exec rake %CHECK%
 notifications:
   - provider: Email
     to:
       - nobody@nowhere.com
     on_build_success: false
     on_build_failure: false
     on_build_status_changed: false