diff --git a/spec/type_aliases/absolute_path_spec.rb b/spec/type_aliases/absolute_path_spec.rb
index 0e5564f45..14c2f844b 100644
--- a/spec/type_aliases/absolute_path_spec.rb
+++ b/spec/type_aliases/absolute_path_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Absolute_path' do
-    describe 'valid paths handling' do
-      ['C:/', 'C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/', '/var/tmp', '/var/opt/../lib/puppet',
-       '/var/opt//lib/puppet', '/var/ůťƒ8', '/var/ネット'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Absolute_path' do
+  describe 'valid paths handling' do
+    ['C:/', 'C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/', '/var/tmp', '/var/opt/../lib/puppet',
+     '/var/opt//lib/puppet', '/var/ůťƒ8', '/var/ネット'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
+    end
 
-      context 'with relative paths' do
-        ['relative1', '.', '..', './foo', '../foo', 'etc/puppetlabs/puppet', 'opt/puppet/bin', 'relative\\windows', '\\var\\ůťƒ8', '\\var\\ネット'].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+    context 'with relative paths' do
+      ['relative1', '.', '..', './foo', '../foo', 'etc/puppetlabs/puppet', 'opt/puppet/bin', 'relative\\windows', '\\var\\ůťƒ8', '\\var\\ネット'].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/array_spec.rb b/spec/type_aliases/array_spec.rb
index 0b0da3cbf..60495e413 100644
--- a/spec/type_aliases/array_spec.rb
+++ b/spec/type_aliases/array_spec.rb
@@ -1,31 +1,29 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Array' do
-    describe 'accepts arrays' do
-      [
-        [],
-        ['one'],
-        [1],
-        [{}],
-        [[]],
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Array' do
+  describe 'accepts arrays' do
+    [
+      [],
+      ['one'],
+      [1],
+      [{}],
+      [[]],
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '',
-        'one',
-        '1',
-        {},
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '',
+      'one',
+      '1',
+      {},
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/base32_spec.rb b/spec/type_aliases/base32_spec.rb
index 48c47451a..7213c0998 100644
--- a/spec/type_aliases/base32_spec.rb
+++ b/spec/type_aliases/base32_spec.rb
@@ -1,40 +1,38 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Base32' do
-    describe 'valid handling' do
-      ['ASDASDDASD3453453', 'ASDASDDASD3453453=', 'ASDASDDASD3453453==', 'ASDASDDASD3453453===', 'ASDASDDASD3453453====', 'ASDASDDASD3453453=====', 'ASDASDDASD3453453======', 'asdasddasd3453453',
-       'asdasddasd3453453=', 'asdasddasd3453453==', 'asdasddasd3453453===', 'asdasddasd3453453====', 'asdasddasd3453453=====', 'asdasddasd3453453======'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Base32' do
+  describe 'valid handling' do
+    ['ASDASDDASD3453453', 'ASDASDDASD3453453=', 'ASDASDDASD3453453==', 'ASDASDDASD3453453===', 'ASDASDDASD3453453====', 'ASDASDDASD3453453=====', 'ASDASDDASD3453453======', 'asdasddasd3453453',
+     'asdasddasd3453453=', 'asdasddasd3453453==', 'asdasddasd3453453===', 'asdasddasd3453453====', 'asdasddasd3453453=====', 'asdasddasd3453453======'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          "\nASDASDDASD3453453",
-          "\nASDASDDASD3453453\n",
-          "ASDASDDASD3453453\n",
-          '',
-          'asdasd!@#$',
-          '=asdasd9879876876+/',
-          'asda=sd9879876876+/',
-          'asdaxsd9879876876+/===',
-          'asdads asdasd',
-          'asdasddasd3453453=======',
-          'asdaSddasd',
-          'asdasddasd1',
-          'asdasddasd9',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        "\nASDASDDASD3453453",
+        "\nASDASDDASD3453453\n",
+        "ASDASDDASD3453453\n",
+        '',
+        'asdasd!@#$',
+        '=asdasd9879876876+/',
+        'asda=sd9879876876+/',
+        'asdaxsd9879876876+/===',
+        'asdads asdasd',
+        'asdasddasd3453453=======',
+        'asdaSddasd',
+        'asdasddasd1',
+        'asdasddasd9',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/base64_spec.rb b/spec/type_aliases/base64_spec.rb
index 0de9e6daf..fd02799a6 100644
--- a/spec/type_aliases/base64_spec.rb
+++ b/spec/type_aliases/base64_spec.rb
@@ -1,35 +1,33 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Base64' do
-    describe 'valid handling' do
-      ['asdasdASDSADA342386832/746+=', 'asdasdASDSADA34238683274/6+', 'asdasdASDSADA3423868327/46+=='].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Base64' do
+  describe 'valid handling' do
+    ['asdasdASDSADA342386832/746+=', 'asdasdASDSADA34238683274/6+', 'asdasdASDSADA3423868327/46+=='].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\nasdasdASDSADA342386832/746+=",
-          "\nasdasdASDSADA342386832/746+=\n",
-          "asdasdASDSADA342386832/746+=\n",
-          'asdasd!@#$',
-          '=asdasd9879876876+/',
-          'asda=sd9879876876+/',
-          'asdaxsd9879876876+/===',
-          'asdads asdasd',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\nasdasdASDSADA342386832/746+=",
+        "\nasdasdASDSADA342386832/746+=\n",
+        "asdasdASDSADA342386832/746+=\n",
+        'asdasd!@#$',
+        '=asdasd9879876876+/',
+        'asda=sd9879876876+/',
+        'asdaxsd9879876876+/===',
+        'asdads asdasd',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/bool_spec.rb b/spec/type_aliases/bool_spec.rb
index bdc8f75f6..2b8345764 100644
--- a/spec/type_aliases/bool_spec.rb
+++ b/spec/type_aliases/bool_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Bool' do
-    describe 'accepts booleans' do
-      [
-        true,
-        false,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Bool' do
+  describe 'accepts booleans' do
+    [
+      true,
+      false,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        [1],
-        [{}],
-        [true],
-        'true',
-        'false',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      [1],
+      [{}],
+      [true],
+      'true',
+      'false',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/compat__ip_address.rb b/spec/type_aliases/compat__ip_address.rb
index 671c64b2f..46c4a3290 100644
--- a/spec/type_aliases/compat__ip_address.rb
+++ b/spec/type_aliases/compat__ip_address.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Ip_address' do
-    describe 'accepts ipv4 and ipv6 addresses' do
-      [
-        '224.0.0.0',
-        '255.255.255.255',
-        '0.0.0.0',
-        '192.88.99.0',
-        '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-        'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Ip_address' do
+  describe 'accepts ipv4 and ipv6 addresses' do
+    [
+      '224.0.0.0',
+      '255.255.255.255',
+      '0.0.0.0',
+      '192.88.99.0',
+      '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+      'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
-    describe 'rejects other values' do
-      [
-        nil,
-        [nil],
-        [nil, nil],
-        { 'foo' => 'bar' },
-        {},
-        '',
-        'nope',
-        '77',
-        '4.4.4',
-        '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  end
+  describe 'rejects other values' do
+    [
+      nil,
+      [nil],
+      [nil, nil],
+      { 'foo' => 'bar' },
+      {},
+      '',
+      'nope',
+      '77',
+      '4.4.4',
+      '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/compat__ipv4_spec.rb b/spec/type_aliases/compat__ipv4_spec.rb
index dfd4be180..f767c5442 100644
--- a/spec/type_aliases/compat__ipv4_spec.rb
+++ b/spec/type_aliases/compat__ipv4_spec.rb
@@ -1,19 +1,17 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Ipv4' do
-    describe 'accepts ipv4 addresses' do
-      SharedData::IPV4_PATTERNS.each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Ipv4' do
+  describe 'accepts ipv4 addresses' do
+    SharedData::IPV4_PATTERNS.each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
-    describe 'rejects other values' do
-      SharedData::IPV4_NEGATIVE_PATTERNS.each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  end
+  describe 'rejects other values' do
+    SharedData::IPV4_NEGATIVE_PATTERNS.each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/compat__ipv6_spec.rb b/spec/type_aliases/compat__ipv6_spec.rb
index 94211b695..6760f7915 100644
--- a/spec/type_aliases/compat__ipv6_spec.rb
+++ b/spec/type_aliases/compat__ipv6_spec.rb
@@ -1,43 +1,41 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Ipv6' do
-    describe 'accepts ipv6 addresses' do
-      [
-        '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-        'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
-        'fe80:0000:0000:0000:0204:61ff:fe9d:f156',
-        'fe80:0:0:0:204:61ff:fe9d:f156',
-        'fe80::204:61ff:fe9d:f156',
-        'fe80:0:0:0:0204:61ff:254.157.241.86',
-        '::1',
-        'fe80::',
-        '2001::',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Ipv6' do
+  describe 'accepts ipv6 addresses' do
+    [
+      '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+      'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
+      'fe80:0000:0000:0000:0204:61ff:fe9d:f156',
+      'fe80:0:0:0:204:61ff:fe9d:f156',
+      'fe80::204:61ff:fe9d:f156',
+      'fe80:0:0:0:0204:61ff:254.157.241.86',
+      '::1',
+      'fe80::',
+      '2001::',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
-    describe 'rejects other values' do
-      [
-        nil,
-        [nil],
-        [nil, nil],
-        { 'foo' => 'bar' },
-        {},
-        '',
-        'nope',
-        '77',
-        '4.4.4',
-        '2000:7334',
-        '::ffff:2.3.4',
-        '::ffff:257.1.2.3',
-        '::ffff:12345678901234567890.1.26',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  end
+  describe 'rejects other values' do
+    [
+      nil,
+      [nil],
+      [nil, nil],
+      { 'foo' => 'bar' },
+      {},
+      '',
+      'nope',
+      '77',
+      '4.4.4',
+      '2000:7334',
+      '::ffff:2.3.4',
+      '::ffff:257.1.2.3',
+      '::ffff:12345678901234567890.1.26',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/datasize_spec.rb b/spec/type_aliases/datasize_spec.rb
index b5976fd26..d9e1e8644 100644
--- a/spec/type_aliases/datasize_spec.rb
+++ b/spec/type_aliases/datasize_spec.rb
@@ -1,38 +1,36 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Datasize' do
-    describe 'valid handling' do
-      ['42b', '42B', '42k', '42K', '42m', '42M', '42g', '42G', '42t', '42T',
-       '42kb', '42Kb', '42mb', '42Mb', '42gb', '42Gb', '42Tb', '42Tb',
-       '42kB', '42KB', '42mB', '42MB', '42gB', '42GB', '42TB', '42TB'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
-      end
-    end
+describe 'Stdlib::Datasize' do
+  describe 'valid handling' do
+    ['42b', '42B', '42k', '42K', '42m', '42M', '42g', '42G', '42t', '42T',
+     '42kb', '42Kb', '42mb', '42Mb', '42gb', '42Gb', '42Tb', '42Tb',
+     '42kB', '42KB', '42mB', '42MB', '42gB', '42GB', '42TB', '42TB'].each do |value|
+       describe value.inspect do
+         it { is_expected.to allow_value(value) }
+       end
+     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          1024,
-          '1024',
-          '1024byte',
-          '1024bit',
-          '1024Gig',
-          '1024Meg',
-          '1024BM',
-          '1024bg',
-          '1024Meb',
-          'asdaSddasd',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        1024,
+        '1024',
+        '1024byte',
+        '1024bit',
+        '1024Gig',
+        '1024Meg',
+        '1024BM',
+        '1024bg',
+        '1024Meb',
+        'asdaSddasd',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/filemode_spec.rb b/spec/type_aliases/filemode_spec.rb
index c5a60857c..23f276bfc 100644
--- a/spec/type_aliases/filemode_spec.rb
+++ b/spec/type_aliases/filemode_spec.rb
@@ -2,59 +2,57 @@
 
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Filemode' do
-    describe 'valid modes' do
-      [
-        '7',
-        '12',
-        '666',
+describe 'Stdlib::Filemode' do
+  describe 'valid modes' do
+    [
+      '7',
+      '12',
+      '666',
 
-        '0000',
-        '0644',
-        '1644',
-        '2644',
-        '4644',
-        '0123',
-        '0777',
+      '0000',
+      '0644',
+      '1644',
+      '2644',
+      '4644',
+      '0123',
+      '0777',
 
-        'a=,o-r,u+X,g=w',
-        'a=Xr,+0',
-        'u=rwx,g+rX',
-        'u+s,g-s',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+      'a=,o-r,u+X,g=w',
+      'a=Xr,+0',
+      'u=rwx,g+rX',
+      'u+s,g-s',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid modes' do
-      context 'with garbage inputs' do
-        [
-          true,
-          false,
-          :keyword,
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\n0644",
-          "\n0644\n",
-          "0644\n",
-          'ネット',
-          '55555',
-          '0x123',
-          '0649',
+  describe 'invalid modes' do
+    context 'with garbage inputs' do
+      [
+        true,
+        false,
+        :keyword,
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\n0644",
+        "\n0644\n",
+        "0644\n",
+        'ネット',
+        '55555',
+        '0x123',
+        '0649',
 
-          '=8,X',
-          'x=r,a=wx',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+        '=8,X',
+        'x=r,a=wx',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/filesource_spec.rb b/spec/type_aliases/filesource_spec.rb
index 544a90ea3..8c41958a9 100644
--- a/spec/type_aliases/filesource_spec.rb
+++ b/spec/type_aliases/filesource_spec.rb
@@ -1,62 +1,60 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Filesource' do
-    describe 'valid handling' do
-      [
-        'https://hello.com',
-        'https://notcreative.org',
-        'https://canstillaccepthttps.co.uk',
-        'http://anhttp.com',
-        'http://runningoutofideas.gov',
-        'file:///hello/bla',
-        'file:///foo/bar.log',
-        'puppet:///modules/foo/bar.log',
-        'puppet://pm.example.com/modules/foo/bar.log',
-        'puppet://192.0.2.1/modules/foo/bar.log',
-        '/usr2/username/bin:/usr/local/bin:/usr/bin:.',
-        'C:/',
-        'C:\\',
-        'C:\\WINDOWS\\System32',
-        'C:/windows/system32',
-        'X:/foo/bar',
-        'X:\\foo\\bar',
-        '\\\\host\\windows',
-        '//host/windows',
-        '/var/tmp',
-        '/var/opt/../lib/puppet',
-        'puppet:///a_custom_mount_point/foo/bar/foobar.conf',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Filesource' do
+  describe 'valid handling' do
+    [
+      'https://hello.com',
+      'https://notcreative.org',
+      'https://canstillaccepthttps.co.uk',
+      'http://anhttp.com',
+      'http://runningoutofideas.gov',
+      'file:///hello/bla',
+      'file:///foo/bar.log',
+      'puppet:///modules/foo/bar.log',
+      'puppet://pm.example.com/modules/foo/bar.log',
+      'puppet://192.0.2.1/modules/foo/bar.log',
+      '/usr2/username/bin:/usr/local/bin:/usr/bin:.',
+      'C:/',
+      'C:\\',
+      'C:\\WINDOWS\\System32',
+      'C:/windows/system32',
+      'X:/foo/bar',
+      'X:\\foo\\bar',
+      '\\\\host\\windows',
+      '//host/windows',
+      '/var/tmp',
+      '/var/opt/../lib/puppet',
+      'puppet:///a_custom_mount_point/foo/bar/foobar.conf',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\nfile:///foo/bar.log",
-          "\nfile:///foo/bar.log\n",
-          "file:///foo/bar.log\n",
-          "\npuppet:///modules/foo/bar.log",
-          "\npuppet:///modules/foo/bar.log\n",
-          "puppet:///modules/foo/bar.log\n",
-          '*/Users//nope',
-          '\\Users/hc/wksp/stdlib',
-          'C:noslashes',
-          '\\var\\tmp',
-          'puppet://bob@pm.example.com/modules/foo/bar.log',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\nfile:///foo/bar.log",
+        "\nfile:///foo/bar.log\n",
+        "file:///foo/bar.log\n",
+        "\npuppet:///modules/foo/bar.log",
+        "\npuppet:///modules/foo/bar.log\n",
+        "puppet:///modules/foo/bar.log\n",
+        '*/Users//nope',
+        '\\Users/hc/wksp/stdlib',
+        'C:noslashes',
+        '\\var\\tmp',
+        'puppet://bob@pm.example.com/modules/foo/bar.log',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/float_spec.rb b/spec/type_aliases/float_spec.rb
index 3d1d6673a..260c495fc 100644
--- a/spec/type_aliases/float_spec.rb
+++ b/spec/type_aliases/float_spec.rb
@@ -1,25 +1,23 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Float' do
-    describe 'accepts floats' do
-      [
-        3.7,
-        '3.7',
-        -3.7,
-        '-342.2315e-12',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Float' do
+  describe 'accepts floats' do
+    [
+      3.7,
+      '3.7',
+      -3.7,
+      '-342.2315e-12',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test', {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x', 3, '3', -3, '-3'].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test', {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x', 3, '3', -3, '-3'].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/fqdn_spec.rb b/spec/type_aliases/fqdn_spec.rb
index c8dfef135..45f855c90 100644
--- a/spec/type_aliases/fqdn_spec.rb
+++ b/spec/type_aliases/fqdn_spec.rb
@@ -1,32 +1,30 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Fqdn' do
-    describe 'valid handling' do
-      ['example', 'example.com', 'www.example.com'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Fqdn' do
+  describe 'valid handling' do
+    ['example', 'example.com', 'www.example.com'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\nexample",
-          "\nexample\n",
-          "example\n",
-          '2001:DB8::1',
-          'www www.example.com',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\nexample",
+        "\nexample\n",
+        "example\n",
+        '2001:DB8::1',
+        'www www.example.com',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/hash_spec.rb b/spec/type_aliases/hash_spec.rb
index 6e88a4268..e26601868 100644
--- a/spec/type_aliases/hash_spec.rb
+++ b/spec/type_aliases/hash_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Hash' do
-    describe 'accepts hashes' do
-      [
-        {},
-        { 'one' => 'two' },
-        { 'wan' => 3 },
-        { '001' => 'helly' },
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Hash' do
+  describe 'accepts hashes' do
+    [
+      {},
+      { 'one' => 'two' },
+      { 'wan' => 3 },
+      { '001' => 'helly' },
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
-    describe 'rejects other values' do
-      [
-        '',
-        'one',
-        '1',
-        [],
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  end
+  describe 'rejects other values' do
+    [
+      '',
+      'one',
+      '1',
+      [],
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/host_spec.rb b/spec/type_aliases/host_spec.rb
index acf9b1f41..d2d71cd8c 100644
--- a/spec/type_aliases/host_spec.rb
+++ b/spec/type_aliases/host_spec.rb
@@ -1,32 +1,30 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Host' do
-    describe 'valid handling' do
-      ['example', 'example.com', 'www.example.com', '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'fa76:8765:34ac:0823:ab76:eee9:0987:1111', '2001:0db8::1', '224.0.0.0', '255.255.255.255',
-       '0.0.0.0', '192.88.99.0'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Host' do
+  describe 'valid handling' do
+    ['example', 'example.com', 'www.example.com', '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'fa76:8765:34ac:0823:ab76:eee9:0987:1111', '2001:0db8::1', '224.0.0.0', '255.255.255.255',
+     '0.0.0.0', '192.88.99.0'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid handling' do
-      context 'garbage inputs' do
-        [
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'www www.example.com',
-          'bob@example.com',
-          '%.example.com',
-          '2001:0d8',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid handling' do
+    context 'garbage inputs' do
+      [
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'www www.example.com',
+        'bob@example.com',
+        '%.example.com',
+        '2001:0d8',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/httpstatus_spec.rb b/spec/type_aliases/httpstatus_spec.rb
index 16721bec6..fb7f4cc7a 100644
--- a/spec/type_aliases/httpstatus_spec.rb
+++ b/spec/type_aliases/httpstatus_spec.rb
@@ -1,38 +1,36 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::HttpStatus' do
-    describe 'valid HTTP Status' do
-      [
-        200,
-        302,
-        404,
-        418,
-        503,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::HttpStatus' do
+  describe 'valid HTTP Status' do
+    [
+      200,
+      302,
+      404,
+      418,
+      503,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '199',
-          600,
-          1_000,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '199',
+        600,
+        1_000,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/httpsurl_spec.rb b/spec/type_aliases/httpsurl_spec.rb
index 07f6804d4..508e7fbfb 100644
--- a/spec/type_aliases/httpsurl_spec.rb
+++ b/spec/type_aliases/httpsurl_spec.rb
@@ -1,36 +1,34 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::HTTPSUrl' do
-    describe 'valid handling' do
-      ['https://hello.com', 'https://notcreative.org', 'https://notexciting.co.uk', 'https://graphemica.com/❤', 'https://graphemica.com/緩', 'HTTPS://FOO.com'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::HTTPSUrl' do
+  describe 'valid handling' do
+    ['https://hello.com', 'https://notcreative.org', 'https://notexciting.co.uk', 'https://graphemica.com/❤', 'https://graphemica.com/緩', 'HTTPS://FOO.com'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\nhttps://hello.com",
-          "\nhttps://hello.com\n",
-          "https://hello.com\n",
-          'httds://notquiteright.org',
-          'hptts:/nah',
-          'https;//notrightbutclose.org',
-          'http://graphemica.com/❤',
-          'http://graphemica.com/緩',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\nhttps://hello.com",
+        "\nhttps://hello.com\n",
+        "https://hello.com\n",
+        'httds://notquiteright.org',
+        'hptts:/nah',
+        'https;//notrightbutclose.org',
+        'http://graphemica.com/❤',
+        'http://graphemica.com/緩',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/httpurl_spec.rb b/spec/type_aliases/httpurl_spec.rb
index 420b06eaa..c4a7e8f64 100644
--- a/spec/type_aliases/httpurl_spec.rb
+++ b/spec/type_aliases/httpurl_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::HTTPUrl' do
-    describe 'valid handling' do
-      ['https://hello.com', 'https://notcreative.org', 'https://canstillaccepthttps.co.uk', 'http://anhttp.com', 'http://runningoutofideas.gov',
-       'http://', 'http://graphemica.com/❤', 'http://graphemica.com/緩', 'HTTPS://FOO.COM', 'HTTP://BAR.COM'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::HTTPUrl' do
+  describe 'valid handling' do
+    ['https://hello.com', 'https://notcreative.org', 'https://canstillaccepthttps.co.uk', 'http://anhttp.com', 'http://runningoutofideas.gov',
+     'http://', 'http://graphemica.com/❤', 'http://graphemica.com/緩', 'HTTPS://FOO.COM', 'HTTP://BAR.COM'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\nhttp://hello.com",
-          "\nhttp://hello.com\n",
-          "http://hello.com\n",
-          'httds://notquiteright.org',
-          'hptts:/nah',
-          'https;//notrightbutclose.org',
-          'hts://graphemica.com/❤',
-          'https:graphemica.com/緩',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\nhttp://hello.com",
+        "\nhttp://hello.com\n",
+        "http://hello.com\n",
+        'httds://notquiteright.org',
+        'hptts:/nah',
+        'https;//notrightbutclose.org',
+        'hts://graphemica.com/❤',
+        'https:graphemica.com/緩',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/integer_spec.rb b/spec/type_aliases/integer_spec.rb
index 29298fa65..f299f56b5 100644
--- a/spec/type_aliases/integer_spec.rb
+++ b/spec/type_aliases/integer_spec.rb
@@ -1,28 +1,26 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Integer' do
-    describe 'accepts integers' do
-      [
-        3,
-        '3',
-        -3,
-        '-3',
-        "123\nfoo",
-        "foo\n123",
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Integer' do
+  describe 'accepts integers' do
+    [
+      3,
+      '3',
+      -3,
+      '-3',
+      "123\nfoo",
+      "foo\n123",
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      ["foo\nbar", true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test',
-       {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x', 3.7, '3.7', -3.7, '-342.2315e-12'].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    ["foo\nbar", true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test',
+     {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x', 3.7, '3.7', -3.7, '-342.2315e-12'].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_nosubnet_spec.rb b/spec/type_aliases/ip_address_nosubnet_spec.rb
index 921d95704..9125c4b9c 100644
--- a/spec/type_aliases/ip_address_nosubnet_spec.rb
+++ b/spec/type_aliases/ip_address_nosubnet_spec.rb
@@ -1,43 +1,41 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::Nosubnet' do
-    describe 'accepts ipv4 and ipv6 addresses without subnets' do
-      [
-        '224.0.0.0',
-        '255.255.255.255',
-        '0.0.0.0',
-        '192.88.99.0',
-        '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-        'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
-        '127.0.0.1',
-        '8.8.4.4',
-        '52.10.10.141',
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        'FF01:0:0:0:0:0:0:101',
-        'FF01::101',
-        '::',
-        '12AB::CD30:192.168.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::Nosubnet' do
+  describe 'accepts ipv4 and ipv6 addresses without subnets' do
+    [
+      '224.0.0.0',
+      '255.255.255.255',
+      '0.0.0.0',
+      '192.88.99.0',
+      '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+      'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
+      '127.0.0.1',
+      '8.8.4.4',
+      '52.10.10.141',
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      'FF01:0:0:0:0:0:0:101',
+      'FF01::101',
+      '::',
+      '12AB::CD30:192.168.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '10.1.240.4/24',
-        'FF01:0:0:0:0:0:0:101/32',
-        'FF01::101/60',
-        'nope',
-        '77',
-        '4.4.4',
-        '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '10.1.240.4/24',
+      'FF01:0:0:0:0:0:0:101/32',
+      'FF01::101/60',
+      'nope',
+      '77',
+      '4.4.4',
+      '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_spec.rb b/spec/type_aliases/ip_address_spec.rb
index e60335068..0127a0107 100644
--- a/spec/type_aliases/ip_address_spec.rb
+++ b/spec/type_aliases/ip_address_spec.rb
@@ -1,43 +1,41 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address' do
-    describe 'accepts ipv4 and ipv6 addresses' do
-      [
-        '224.0.0.0',
-        '255.255.255.255',
-        '0.0.0.0',
-        '192.88.99.0',
-        '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
-        'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
-        '127.0.0.1',
-        '8.8.4.4',
-        '10.1.240.4/24',
-        '52.10.10.141',
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        'FF01:0:0:0:0:0:0:101',
-        'FF01::101',
-        'FF01:0:0:0:0:0:0:101/32',
-        'FF01::101/60',
-        '::',
-        '12AB::CD30:192.168.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address' do
+  describe 'accepts ipv4 and ipv6 addresses' do
+    [
+      '224.0.0.0',
+      '255.255.255.255',
+      '0.0.0.0',
+      '192.88.99.0',
+      '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+      'fa76:8765:34ac:0823:ab76:eee9:0987:1111',
+      '127.0.0.1',
+      '8.8.4.4',
+      '10.1.240.4/24',
+      '52.10.10.141',
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      'FF01:0:0:0:0:0:0:101',
+      'FF01::101',
+      'FF01:0:0:0:0:0:0:101/32',
+      'FF01::101/60',
+      '::',
+      '12AB::CD30:192.168.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'nope',
-        '77',
-        '4.4.4',
-        '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'nope',
+      '77',
+      '4.4.4',
+      '2001:0db8:85a3:000000:0000:8a2e:0370:7334',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v4_nosubnet_spec.rb b/spec/type_aliases/ip_address_v4_nosubnet_spec.rb
index ab74f8ce8..cfef493d1 100644
--- a/spec/type_aliases/ip_address_v4_nosubnet_spec.rb
+++ b/spec/type_aliases/ip_address_v4_nosubnet_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V4::Nosubnet' do
-    describe 'accepts ipv4 addresses without subnets' do
-      [
-        '127.0.0.1',
-        '8.8.4.4',
-        '52.10.10.141',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V4::Nosubnet' do
+  describe 'accepts ipv4 addresses without subnets' do
+    [
+      '127.0.0.1',
+      '8.8.4.4',
+      '52.10.10.141',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '10.1.240.4/24',
-        '192.168.1',
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        '12AB::CD30:192.168.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '10.1.240.4/24',
+      '192.168.1',
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      '12AB::CD30:192.168.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v4_spec.rb b/spec/type_aliases/ip_address_v4_spec.rb
index 10854c8fa..7f5d3613a 100644
--- a/spec/type_aliases/ip_address_v4_spec.rb
+++ b/spec/type_aliases/ip_address_v4_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V4' do
-    describe 'accepts ipv4 addresses' do
-      [
-        '127.0.0.1',
-        '8.8.4.4',
-        '10.1.240.4/24',
-        '52.10.10.141',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V4' do
+  describe 'accepts ipv4 addresses' do
+    [
+      '127.0.0.1',
+      '8.8.4.4',
+      '10.1.240.4/24',
+      '52.10.10.141',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '192.168.1',
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        '12AB::CD30:192.168.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '192.168.1',
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      '12AB::CD30:192.168.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_alternative_spec.rb b/spec/type_aliases/ip_address_v6_alternative_spec.rb
index 9fbf7ca72..fa7fb6038 100644
--- a/spec/type_aliases/ip_address_v6_alternative_spec.rb
+++ b/spec/type_aliases/ip_address_v6_alternative_spec.rb
@@ -1,27 +1,25 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Alternative' do
-    describe 'accepts ipv6 addresses in alternative format' do
-      [
-        '0:0:0:0:0:0:13.1.68.3',
-        '0:0:0:0:0:FFFF:129.144.52.38',
-        '0:0:0:0:0:FFFF:129.144.52.38/60',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Alternative' do
+  describe 'accepts ipv6 addresses in alternative format' do
+    [
+      '0:0:0:0:0:0:13.1.68.3',
+      '0:0:0:0:0:FFFF:129.144.52.38',
+      '0:0:0:0:0:FFFF:129.144.52.38/60',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'nope',
-        '127.0.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'nope',
+      '127.0.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_cidr_spec.rb b/spec/type_aliases/ip_address_v6_cidr_spec.rb
index 4b8fee3bb..70fb3d75b 100644
--- a/spec/type_aliases/ip_address_v6_cidr_spec.rb
+++ b/spec/type_aliases/ip_address_v6_cidr_spec.rb
@@ -1,32 +1,30 @@
 
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::CIDR' do
-    describe 'accepts ipv6 addresses in cidr format' do
-      [
-        'FF01:0:0:0:0:0:0:101/32',
-        'FF01::101/60',
-        '::/0',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::CIDR' do
+  describe 'accepts ipv6 addresses in cidr format' do
+    [
+      'FF01:0:0:0:0:0:0:101/32',
+      'FF01::101/60',
+      '::/0',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        'FF01:0:0:0:0:0:0:101',
-        'FF01::101',
-        '12AB::CD30:192.168.0.1',
-        '127.0.0.1',
-        '10.1.240.4/24',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      'FF01:0:0:0:0:0:0:101',
+      'FF01::101',
+      '12AB::CD30:192.168.0.1',
+      '127.0.0.1',
+      '10.1.240.4/24',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_compressed_spec.rb b/spec/type_aliases/ip_address_v6_compressed_spec.rb
index e2b7dd533..f9a4865e4 100644
--- a/spec/type_aliases/ip_address_v6_compressed_spec.rb
+++ b/spec/type_aliases/ip_address_v6_compressed_spec.rb
@@ -1,30 +1,28 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Compressed' do
-    describe 'accepts ipv6 addresses in compressed format' do
-      [
-        '1080::8:800:200C:417A',
-        '1080::8:800:200C:417A/60',
-        'FF01::101',
-        '::1',
-        '::',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Compressed' do
+  describe 'accepts ipv6 addresses in compressed format' do
+    [
+      '1080::8:800:200C:417A',
+      '1080::8:800:200C:417A/60',
+      'FF01::101',
+      '::1',
+      '::',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'nope',
-        '127.0.0.1',
-        'FEDC::BA98:7654:3210::3210',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'nope',
+      '127.0.0.1',
+      'FEDC::BA98:7654:3210::3210',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_full_spec.rb b/spec/type_aliases/ip_address_v6_full_spec.rb
index cc8013d87..081837fba 100644
--- a/spec/type_aliases/ip_address_v6_full_spec.rb
+++ b/spec/type_aliases/ip_address_v6_full_spec.rb
@@ -1,27 +1,25 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Full' do
-    describe 'accepts ipv6 addresses in full format' do
-      [
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60',
-        '1080:0:0:0:8:800:200C:417A',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Full' do
+  describe 'accepts ipv6 addresses in full format' do
+    [
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60',
+      '1080:0:0:0:8:800:200C:417A',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'nope',
-        '127.0.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'nope',
+      '127.0.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_nosubnet_alternative_spec.rb b/spec/type_aliases/ip_address_v6_nosubnet_alternative_spec.rb
index 0b36cb9ca..adf1532f8 100644
--- a/spec/type_aliases/ip_address_v6_nosubnet_alternative_spec.rb
+++ b/spec/type_aliases/ip_address_v6_nosubnet_alternative_spec.rb
@@ -1,27 +1,25 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Nosubnet::Alternative' do
-    describe 'accepts ipv6 addresses in alternative format without subnets' do
-      [
-        '0:0:0:0:0:0:13.1.68.3',
-        '0:0:0:0:0:FFFF:129.144.52.38',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Nosubnet::Alternative' do
+  describe 'accepts ipv6 addresses in alternative format without subnets' do
+    [
+      '0:0:0:0:0:0:13.1.68.3',
+      '0:0:0:0:0:FFFF:129.144.52.38',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '0:0:0:0:0:FFFF:129.144.52.38/60',
-        'nope',
-        '127.0.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '0:0:0:0:0:FFFF:129.144.52.38/60',
+      'nope',
+      '127.0.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_nosubnet_compressed_spec.rb b/spec/type_aliases/ip_address_v6_nosubnet_compressed_spec.rb
index 96af0354c..6d45cd152 100644
--- a/spec/type_aliases/ip_address_v6_nosubnet_compressed_spec.rb
+++ b/spec/type_aliases/ip_address_v6_nosubnet_compressed_spec.rb
@@ -1,30 +1,28 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Nosubnet::Compressed' do
-    describe 'accepts ipv6 addresses in compressed format without subnets' do
-      [
-        '1080::8:800:200C:417A',
-        'FF01::101',
-        '::1',
-        '::',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Nosubnet::Compressed' do
+  describe 'accepts ipv6 addresses in compressed format without subnets' do
+    [
+      '1080::8:800:200C:417A',
+      'FF01::101',
+      '::1',
+      '::',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '1080::8:800:200C:417A/60',
-        'nope',
-        '127.0.0.1',
-        'FEDC::BA98:7654:3210::3210',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '1080::8:800:200C:417A/60',
+      'nope',
+      '127.0.0.1',
+      'FEDC::BA98:7654:3210::3210',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_nosubnet_full_spec.rb b/spec/type_aliases/ip_address_v6_nosubnet_full_spec.rb
index 9135e002d..f79dc0384 100644
--- a/spec/type_aliases/ip_address_v6_nosubnet_full_spec.rb
+++ b/spec/type_aliases/ip_address_v6_nosubnet_full_spec.rb
@@ -1,27 +1,25 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6::Nosubnet::Full' do
-    describe 'accepts ipv6 addresses in full format without subnets' do
-      [
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        '1080:0:0:0:8:800:200C:417A',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6::Nosubnet::Full' do
+  describe 'accepts ipv6 addresses in full format without subnets' do
+    [
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      '1080:0:0:0:8:800:200C:417A',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60',
-        'nope',
-        '127.0.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60',
+      'nope',
+      '127.0.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/ip_address_v6_spec.rb b/spec/type_aliases/ip_address_v6_spec.rb
index 864c56538..f2121e683 100644
--- a/spec/type_aliases/ip_address_v6_spec.rb
+++ b/spec/type_aliases/ip_address_v6_spec.rb
@@ -1,31 +1,29 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::IP::Address::V6' do
-    describe 'accepts ipv6 addresses' do
-      [
-        'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
-        'FF01:0:0:0:0:0:0:101',
-        'FF01::101',
-        'FF01:0:0:0:0:0:0:101/32',
-        'FF01::101/60',
-        '::',
-        '12AB::CD30:192.168.0.1',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::IP::Address::V6' do
+  describe 'accepts ipv6 addresses' do
+    [
+      'FEDC:BA98:7654:3210:FEDC:BA98:7654:3210',
+      'FF01:0:0:0:0:0:0:101',
+      'FF01::101',
+      'FF01:0:0:0:0:0:0:101/32',
+      'FF01::101/60',
+      '::',
+      '12AB::CD30:192.168.0.1',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '127.0.0.1',
-        '10.1.240.4/24',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '127.0.0.1',
+      '10.1.240.4/24',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/mac_spec.rb b/spec/type_aliases/mac_spec.rb
index af8cd177e..7a5f4da02 100644
--- a/spec/type_aliases/mac_spec.rb
+++ b/spec/type_aliases/mac_spec.rb
@@ -1,38 +1,36 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::MAC' do
-    describe 'valid handling' do
-      [
-        '00:a0:1f:12:7f:a0',
-        '00:A0:1F:12:7F:A0',
-        '00-A0-1F-12-7F-A0',
-        '80:00:02:09:fe:80:00:00:00:00:00:00:00:24:65:ff:ff:91:a3:12',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::MAC' do
+  describe 'valid handling' do
+    [
+      '00:a0:1f:12:7f:a0',
+      '00:A0:1F:12:7F:A0',
+      '00-A0-1F-12-7F-A0',
+      '80:00:02:09:fe:80:00:00:00:00:00:00:00:24:65:ff:ff:91:a3:12',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'one',
-          '00:00:00:00:00:0g',
-          "\n00:a0:1f:12:7f:a0",
-          "\n00:a0:1f:12:7f:a0\n",
-          "00:a0:1f:12:7f:a0\n",
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'one',
+        '00:00:00:00:00:0g',
+        "\n00:a0:1f:12:7f:a0",
+        "\n00:a0:1f:12:7f:a0\n",
+        "00:a0:1f:12:7f:a0\n",
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/numeric_spec.rb b/spec/type_aliases/numeric_spec.rb
index a59b4e227..6fed6ac4e 100644
--- a/spec/type_aliases/numeric_spec.rb
+++ b/spec/type_aliases/numeric_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::Numeric' do
-    describe 'accepts numerics' do
-      [
-        3,
-        '3',
-        -3,
-        '-3',
-        3.7,
-        '3.7',
-        -3.7,
-        '-342.2315e-12',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::Numeric' do
+  describe 'accepts numerics' do
+    [
+      3,
+      '3',
+      -3,
+      '-3',
+      3.7,
+      '3.7',
+      -3.7,
+      '-342.2315e-12',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test', {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x'].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [true, 'true', false, 'false', 'iAmAString', '1test', '1 test', 'test 1', 'test 1 test', {}, { 'key' => 'value' }, { 1 => 2 }, '', :undef, 'x'].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/objectstore_gsuri_spec.rb b/spec/type_aliases/objectstore_gsuri_spec.rb
index 5b9390aac..c96787fa9 100644
--- a/spec/type_aliases/objectstore_gsuri_spec.rb
+++ b/spec/type_aliases/objectstore_gsuri_spec.rb
@@ -1,34 +1,32 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::ObjectStore::GSUri' do
-    describe 'accepts case-sensitive google cloud gs uris' do
-      [
-        'gs://mybucket/myfile.csv',
-        'gs://bucket/path/to/file.tar.gz',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::ObjectStore::GSUri' do
+  describe 'accepts case-sensitive google cloud gs uris' do
+    [
+      'gs://mybucket/myfile.csv',
+      'gs://bucket/path/to/file.tar.gz',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '',
-        "\ngs://mybucket/myfile.csv",
-        "\ngs://mybucket/myfile.csv\n",
-        "gs://mybucket/myfile.csv\n",
-        'GS://mybucket/myfile.csv',
-        5,
-        'gs//mybucket/myfile.csv',
-        'gs:/mybucket/myfile.csv',
-        'gs:mybucket/myfile.csv',
-        'gs-mybucket/myfile.csv',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '',
+      "\ngs://mybucket/myfile.csv",
+      "\ngs://mybucket/myfile.csv\n",
+      "gs://mybucket/myfile.csv\n",
+      'GS://mybucket/myfile.csv',
+      5,
+      'gs//mybucket/myfile.csv',
+      'gs:/mybucket/myfile.csv',
+      'gs:mybucket/myfile.csv',
+      'gs-mybucket/myfile.csv',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/objectstore_s3uri_spec.rb b/spec/type_aliases/objectstore_s3uri_spec.rb
index c4785abab..256d091ac 100644
--- a/spec/type_aliases/objectstore_s3uri_spec.rb
+++ b/spec/type_aliases/objectstore_s3uri_spec.rb
@@ -1,34 +1,32 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::ObjectStore::S3Uri' do
-    describe 'accepts case-sensitive amazon web services s3 uris' do
-      [
-        's3://bucket-name/path',
-        's3://bucket/path/to/file.txt',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::ObjectStore::S3Uri' do
+  describe 'accepts case-sensitive amazon web services s3 uris' do
+    [
+      's3://bucket-name/path',
+      's3://bucket/path/to/file.txt',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '',
-        "\ns3://bucket-name/path",
-        "\ns3://bucket-name/path\n",
-        "s3://bucket-name/path\n",
-        'S3://bucket-name/path',
-        3,
-        's3:/bucket-name/path',
-        's3//bucket-name/path',
-        's3:bucket-name/path',
-        's3-bucket-name/path',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '',
+      "\ns3://bucket-name/path",
+      "\ns3://bucket-name/path\n",
+      "s3://bucket-name/path\n",
+      'S3://bucket-name/path',
+      3,
+      's3:/bucket-name/path',
+      's3//bucket-name/path',
+      's3:bucket-name/path',
+      's3-bucket-name/path',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/objectstore_spec.rb b/spec/type_aliases/objectstore_spec.rb
index ae3c2caca..7cddc3772 100644
--- a/spec/type_aliases/objectstore_spec.rb
+++ b/spec/type_aliases/objectstore_spec.rb
@@ -1,33 +1,31 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::ObjectStore' do
-    describe 'accepts case-sensitive google cloud gs or amazon web services s3 uris' do
-      [
-        's3://bucket-name/path',
-        's3://bucket/path/to/file.txt',
-        'gs://mybucket/myfile.csv',
-        'gs://bucket/path/to/file.tar.gz',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::ObjectStore' do
+  describe 'accepts case-sensitive google cloud gs or amazon web services s3 uris' do
+    [
+      's3://bucket-name/path',
+      's3://bucket/path/to/file.txt',
+      'gs://mybucket/myfile.csv',
+      'gs://bucket/path/to/file.tar.gz',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        '',
-        'S3://bucket/path',
-        'GS://bucket/path',
-        5,
-        3,
-        'gs//bucket/path/to/file',
-        's3//bucket/path/to/file',
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      '',
+      'S3://bucket/path',
+      'GS://bucket/path',
+      5,
+      3,
+      'gs//bucket/path/to/file',
+      's3//bucket/path/to/file',
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/port__dynamic_spec.rb b/spec/type_aliases/port__dynamic_spec.rb
index 5503e7c0d..0cd95cee2 100644
--- a/spec/type_aliases/port__dynamic_spec.rb
+++ b/spec/type_aliases/port__dynamic_spec.rb
@@ -1,41 +1,39 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Port::Ephemeral' do
-    describe 'valid ephemeral port' do
-      [
-        49_152,
-        51_337,
-        65_000,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Port::Ephemeral' do
+  describe 'valid ephemeral port' do
+    [
+      49_152,
+      51_337,
+      65_000,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '443',
-          -1,
-          80,
-          443,
-          1023,
-          1337,
-          8080,
-          28_080,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '443',
+        -1,
+        80,
+        443,
+        1023,
+        1337,
+        8080,
+        28_080,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/port__privileged_spec.rb b/spec/type_aliases/port__privileged_spec.rb
index 51ddd2478..62af55680 100644
--- a/spec/type_aliases/port__privileged_spec.rb
+++ b/spec/type_aliases/port__privileged_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Port::Privileged' do
-    describe 'valid ports' do
-      [
-        80,
-        443,
-        1023,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Port::Privileged' do
+  describe 'valid ports' do
+    [
+      80,
+      443,
+      1023,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '443',
-          -1,
-          1337,
-          1024,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '443',
+        -1,
+        1337,
+        1024,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/port__unprivileged_spec.rb b/spec/type_aliases/port__unprivileged_spec.rb
index 0009e1f64..afc01a351 100644
--- a/spec/type_aliases/port__unprivileged_spec.rb
+++ b/spec/type_aliases/port__unprivileged_spec.rb
@@ -1,38 +1,36 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Port::Unprivileged' do
-    describe 'valid unprivilegedport' do
-      [
-        1024,
-        1337,
-        65_000,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Port::Unprivileged' do
+  describe 'valid unprivilegedport' do
+    [
+      1024,
+      1337,
+      65_000,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '443',
-          -1,
-          80,
-          443,
-          1023,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '443',
+        -1,
+        80,
+        443,
+        1023,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/port__user_spec.rb b/spec/type_aliases/port__user_spec.rb
index c34e9b227..b931f97b7 100644
--- a/spec/type_aliases/port__user_spec.rb
+++ b/spec/type_aliases/port__user_spec.rb
@@ -1,39 +1,37 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Port::User' do
-    describe 'valid user' do
-      [
-        1024,
-        1337,
-        49_151,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Port::User' do
+  describe 'valid user' do
+    [
+      1024,
+      1337,
+      49_151,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '443',
-          -1,
-          80,
-          443,
-          1023,
-          49_152,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '443',
+        -1,
+        80,
+        443,
+        1023,
+        49_152,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/port_spec.rb b/spec/type_aliases/port_spec.rb
index 3c9582c19..7a9730e72 100644
--- a/spec/type_aliases/port_spec.rb
+++ b/spec/type_aliases/port_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Port' do
-    describe 'valid ports' do
-      [
-        80,
-        443,
-        1337,
-        65_000,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Port' do
+  describe 'valid ports' do
+    [
+      80,
+      443,
+      1337,
+      65_000,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          'https',
-          '443',
-          -1,
-          65_536,
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        'https',
+        '443',
+        -1,
+        65_536,
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/string_spec.rb b/spec/type_aliases/string_spec.rb
index 93a9d0f13..4e6c876c5 100644
--- a/spec/type_aliases/string_spec.rb
+++ b/spec/type_aliases/string_spec.rb
@@ -1,29 +1,27 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Compat::String' do
-    describe 'accepts strings' do
-      [
-        '',
-        'one',
-        nil,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Compat::String' do
+  describe 'accepts strings' do
+    [
+      '',
+      'one',
+      nil,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'rejects other values' do
-      [
-        [],
-        {},
-        1,
-        true,
-      ].each do |value|
-        describe value.inspect do
-          it { is_expected.not_to allow_value(value) }
-        end
+  describe 'rejects other values' do
+    [
+      [],
+      {},
+      1,
+      true,
+    ].each do |value|
+      describe value.inspect do
+        it { is_expected.not_to allow_value(value) }
       end
     end
   end
diff --git a/spec/type_aliases/unixpath_spec.rb b/spec/type_aliases/unixpath_spec.rb
index 3f8372dd0..a0a654410 100644
--- a/spec/type_aliases/unixpath_spec.rb
+++ b/spec/type_aliases/unixpath_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Unixpath' do
-    describe 'valid handling' do
-      ['/usr2/username/bin:/usr/local/bin:/usr/bin:.', '/var/tmp', '/Users/helencampbell/workspace/puppetlabs-stdlib', '/var/ůťƒ8', '/var/ネット', '/var//tmp', '/var/../tmp'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Unixpath' do
+  describe 'valid handling' do
+    ['/usr2/username/bin:/usr/local/bin:/usr/bin:.', '/var/tmp', '/Users/helencampbell/workspace/puppetlabs-stdlib', '/var/ůťƒ8', '/var/ネット', '/var//tmp', '/var/../tmp'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          '',
-          "\n/var/tmp",
-          "\n/var/tmp\n",
-          "/var/tmp\n",
-          'C:/whatever',
-          '\\var\\tmp',
-          '\\Users/hc/wksp/stdlib',
-          '*/Users//nope',
-          "var\ůťƒ8",
-          "var\ネット",
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        '',
+        "\n/var/tmp",
+        "\n/var/tmp\n",
+        "/var/tmp\n",
+        'C:/whatever',
+        '\\var\\tmp',
+        '\\Users/hc/wksp/stdlib',
+        '*/Users//nope',
+        "var\ůťƒ8",
+        "var\ネット",
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end
diff --git a/spec/type_aliases/windowspath_spec.rb b/spec/type_aliases/windowspath_spec.rb
index fb0baaf99..27cb1b33a 100644
--- a/spec/type_aliases/windowspath_spec.rb
+++ b/spec/type_aliases/windowspath_spec.rb
@@ -1,37 +1,35 @@
 require 'spec_helper'
 
-if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
-  describe 'Stdlib::Windowspath' do
-    describe 'valid handling' do
-      ['C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', 'X:/var/ůťƒ8', 'X:/var/ネット'].each do |value|
-        describe value.inspect do
-          it { is_expected.to allow_value(value) }
-        end
+describe 'Stdlib::Windowspath' do
+  describe 'valid handling' do
+    ['C:\\', 'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', 'X:/var/ůťƒ8', 'X:/var/ネット'].each do |value|
+      describe value.inspect do
+        it { is_expected.to allow_value(value) }
       end
     end
+  end
 
-    describe 'invalid path handling' do
-      context 'with garbage inputs' do
-        [
-          nil,
-          [nil],
-          [nil, nil],
-          { 'foo' => 'bar' },
-          {},
-          "\nC:\\",
-          "\nC:\\\n",
-          "C:\\\n",
-          '',
-          'httds://notquiteright.org',
-          '/usr2/username/bin:/usr/local/bin:/usr/bin:.',
-          'C;//notright/here',
-          'C:noslashes',
-          'C:ネット',
-          'C:ůťƒ8',
-        ].each do |value|
-          describe value.inspect do
-            it { is_expected.not_to allow_value(value) }
-          end
+  describe 'invalid path handling' do
+    context 'with garbage inputs' do
+      [
+        nil,
+        [nil],
+        [nil, nil],
+        { 'foo' => 'bar' },
+        {},
+        "\nC:\\",
+        "\nC:\\\n",
+        "C:\\\n",
+        '',
+        'httds://notquiteright.org',
+        '/usr2/username/bin:/usr/local/bin:/usr/bin:.',
+        'C;//notright/here',
+        'C:noslashes',
+        'C:ネット',
+        'C:ůťƒ8',
+      ].each do |value|
+        describe value.inspect do
+          it { is_expected.not_to allow_value(value) }
         end
       end
     end