diff --git a/.rubocop.yml b/.rubocop.yml
index e1043ed..0a1518b 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,514 +1,517 @@
 require: rubocop-rspec
 AllCops:
   TargetRubyVersion: 1.9
   Include:
     - ./**/*.rb
   Exclude:
     - files/**/*
     - vendor/**/*
     - .vendor/**/*
     - pkg/**/*
     - spec/fixtures/**/*
     - Gemfile
     - Rakefile
 Lint/ConditionPosition:
   Enabled: true
 
 Lint/ElseLayout:
   Enabled: true
 
 Lint/UnreachableCode:
   Enabled: true
 
 Lint/UselessComparison:
   Enabled: true
 
 Lint/EnsureReturn:
   Enabled: true
 
 Lint/HandleExceptions:
   Enabled: true
 
 Lint/LiteralInCondition:
   Enabled: true
 
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
 Lint/LiteralInInterpolation:
   Enabled: true
 
 Style/HashSyntax:
   Enabled: false
 
 Style/RedundantReturn:
   Enabled: true
 
 Lint/AmbiguousOperator:
   Enabled: true
 
 Lint/AssignmentInCondition:
   Enabled: true
 
-Style/SpaceBeforeComment:
+Layout/SpaceBeforeComment:
   Enabled: true
 
 Style/AndOr:
   Enabled: true
 
 Style/RedundantSelf:
   Enabled: true
 
 # Method length is not necessarily an indicator of code quality
 Metrics/MethodLength:
   Enabled: false
 
 # Module length is not necessarily an indicator of code quality
 Metrics/ModuleLength:
   Enabled: false
 
 Style/WhileUntilModifier:
   Enabled: true
 
 Lint/AmbiguousRegexpLiteral:
   Enabled: true
 
-Lint/Eval:
+Security/Eval:
   Enabled: true
 
 Lint/BlockAlignment:
   Enabled: true
 
 Lint/DefEndAlignment:
   Enabled: true
 
 Lint/EndAlignment:
   Enabled: true
 
 Lint/DeprecatedClassMethods:
   Enabled: true
 
 Lint/Loop:
   Enabled: true
 
 Lint/ParenthesesAsGroupedExpression:
   Enabled: true
 
 Lint/RescueException:
   Enabled: true
 
 Lint/StringConversionInInterpolation:
   Enabled: true
 
 Lint/UnusedBlockArgument:
   Enabled: true
 
 Lint/UnusedMethodArgument:
   Enabled: true
 
 Lint/UselessAccessModifier:
   Enabled: true
 
 Lint/UselessAssignment:
   Enabled: true
 
 Lint/Void:
   Enabled: true
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: true
 
 Style/AccessorMethodName:
   Enabled: true
 
 Style/Alias:
   Enabled: true
 
-Style/AlignArray:
+Layout/AlignArray:
   Enabled: true
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: true
 
-Style/AlignParameters:
+Layout/AlignParameters:
   Enabled: true
 
 Metrics/BlockNesting:
   Enabled: true
 
 Style/AsciiComments:
   Enabled: true
 
 Style/Attr:
   Enabled: true
 
 Style/BracesAroundHashParameters:
   Enabled: true
 
 Style/CaseEquality:
   Enabled: true
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   Enabled: true
 
 Style/CharacterLiteral:
   Enabled: true
 
 Style/ClassAndModuleCamelCase:
   Enabled: true
 
 Style/ClassAndModuleChildren:
   Enabled: false
 
 Style/ClassCheck:
   Enabled: true
 
 # Class length is not necessarily an indicator of code quality
 Metrics/ClassLength:
   Enabled: false
 
 Style/ClassMethods:
   Enabled: true
 
 Style/ClassVars:
   Enabled: true
 
 Style/WhenThen:
   Enabled: true
 
 Style/WordArray:
   Enabled: true
 
 Style/UnneededPercentQ:
   Enabled: true
 
-Style/Tab:
+Layout/Tab:
   Enabled: true
 
-Style/SpaceBeforeSemicolon:
+Layout/SpaceBeforeSemicolon:
   Enabled: true
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: true
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   Enabled: true
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
   Enabled: true
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: true
 
-Style/LeadingCommentSpace:
+Layout/LeadingCommentSpace:
   Enabled: true
 
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: true
 
-Style/SpaceAfterColon:
+Layout/SpaceAfterColon:
   Enabled: true
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: true
 
-Style/SpaceAfterMethodName:
+Layout/SpaceAfterMethodName:
   Enabled: true
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   Enabled: true
 
-Style/SpaceAfterSemicolon:
+Layout/SpaceAfterSemicolon:
   Enabled: true
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: true
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
-Style/SpaceBeforeComma:
+Layout/SpaceBeforeComma:
   Enabled: true
 
 Style/CollectionMethods:
   Enabled: true
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: true
 
 Style/ColonMethodCall:
   Enabled: true
 
 Style/CommentAnnotation:
   Enabled: true
 
 # 'Complexity' is very relative
 Metrics/CyclomaticComplexity:
   Enabled: false
 
 Style/ConstantName:
   Enabled: true
 
 Style/Documentation:
   Enabled: false
 
 Style/DefWithParentheses:
   Enabled: true
 
 Style/PreferredHashMethods:
   Enabled: true
 
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/DoubleNegation:
   Enabled: true
 
 Style/EachWithObject:
   Enabled: true
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Enabled: true
 
-Style/IndentArray:
+Layout/IndentArray:
   Enabled: true
 
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: true
 
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: true
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: true
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: true
 
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
   Enabled: true
 
 Style/EmptyLiteral:
   Enabled: true
 
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Enabled: false
 
 Style/MethodDefParentheses:
   Enabled: true
 
 Style/LineEndConcatenation:
   Enabled: true
 
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   Enabled: true
 
 Style/StringLiterals:
   Enabled: true
 
 Style/TrailingCommaInArguments:
   Enabled: true
 
 Style/TrailingCommaInLiteral:
   Enabled: true
 
 Style/GlobalVars:
   Enabled: true
 
 Style/GuardClause:
   Enabled: true
 
 Style/IfUnlessModifier:
   Enabled: true
 
 Style/MultilineIfThen:
   Enabled: true
 
 Style/NegatedIf:
   Enabled: true
 
 Style/NegatedWhile:
   Enabled: true
 
 Style/Next:
   Enabled: true
 
 Style/SingleLineBlockParams:
   Enabled: true
 
 Style/SingleLineMethods:
   Enabled: true
 
 Style/SpecialGlobalVars:
   Enabled: true
 
 Style/TrivialAccessors:
   Enabled: true
 
 Style/UnlessElse:
   Enabled: true
 
 Style/VariableInterpolation:
   Enabled: true
 
 Style/VariableName:
   Enabled: true
 
 Style/WhileUntilDo:
   Enabled: true
 
 Style/EvenOdd:
   Enabled: true
 
 Style/FileName:
   Enabled: true
 
 Style/For:
   Enabled: true
 
 Style/Lambda:
   Enabled: true
 
 Style/MethodName:
   Enabled: true
 
 Style/MultilineTernaryOperator:
   Enabled: true
 
 Style/NestedTernaryOperator:
   Enabled: true
 
 Style/NilComparison:
   Enabled: true
 
 Style/FormatString:
   Enabled: true
 
 Style/MultilineBlockChain:
   Enabled: true
 
 Style/Semicolon:
   Enabled: true
 
 Style/SignalException:
   Enabled: true
 
 Style/NonNilCheck:
   Enabled: true
 
 Style/Not:
   Enabled: true
 
 Style/NumericLiterals:
   Enabled: true
 
 Style/OneLineConditional:
   Enabled: true
 
 Style/OpMethod:
   Enabled: true
 
 Style/ParenthesesAroundCondition:
   Enabled: true
 
 Style/PercentLiteralDelimiters:
   Enabled: true
 
 Style/PerlBackrefs:
   Enabled: true
 
 Style/PredicateName:
   Enabled: true
 
 Style/RedundantException:
   Enabled: true
 
 Style/SelfAssignment:
   Enabled: true
 
 Style/Proc:
   Enabled: true
 
 Style/RaiseArgs:
   Enabled: true
 
 Style/RedundantBegin:
   Enabled: true
 
 Style/RescueModifier:
   Enabled: true
 
 # based on https://github.com/voxpupuli/modulesync_config/issues/168
 Style/RegexpLiteral:
   EnforcedStyle: percent_r
   Enabled: true
 
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
 Metrics/ParameterLists:
   Enabled: false
 
 Lint/RequireParentheses:
   Enabled: true
 
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: true
 
 Style/ModuleFunction:
   Enabled: true
 
 Lint/Debugger:
   Enabled: true
 
 Style/IfWithSemicolon:
   Enabled: true
 
 Style/Encoding:
   Enabled: true
 
 Style/BlockDelimiters:
   Enabled: true
 
-Style/MultilineBlockLayout:
+Style/FormatStringToken:
+  Enabled: false
+
+Layout/MultilineBlockLayout:
   Enabled: true
 
 # 'Complexity' is very relative
 Metrics/AbcSize:
   Enabled: False
 
 Metrics/BlockLength:
   Enabled: False
 
 # 'Complexity' is very relative
 Metrics/PerceivedComplexity:
   Enabled: False
 
 Lint/UselessAssignment:
   Enabled: true
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
 Metrics/BlockLength:
   Enabled: false
 
 # RSpec
 
 # We don't use rspec in this way
 RSpec/DescribeClass:
   Enabled: False
 
 # Example length is not necessarily an indicator of code quality
 RSpec/ExampleLength:
   Enabled: False
 
 RSpec/NestedGroups:                                                                                                                                                                                              
-  MaxNesting: 4 
+  Max: 4 
diff --git a/spec/classes/sudo_spec.rb b/spec/classes/sudo_spec.rb
index c7ac288..462c737 100644
--- a/spec/classes/sudo_spec.rb
+++ b/spec/classes/sudo_spec.rb
@@ -1,241 +1,241 @@
 require 'spec_helper'
 describe 'sudo' do
   let :default_params do
     {
       :enable              => true,
       :package_ensure      => 'present',
       :purge               => true,
       :config_file_replace => true
     }
   end
 
   [{},
    {
      :package_ensure      => 'present',
      :purge               => false,
      :config_file_replace => false
    },
    {
      :package_ensure      => 'latest',
      :purge               => true,
      :config_file_replace => false
    }].each do |param_set|
     describe "when #{param_set == {} ? 'using default' : 'specifying'} class parameters" do
       let :param_hash do
         default_params.merge(param_set)
       end
 
       let :params do
         param_set
       end
 
-      %w(Debian Redhat).each do |osfamily|
+      %w[Debian Redhat].each do |osfamily|
         let :facts do
           {
             :operatingsystem           => osfamily,
             :operatingsystemrelease    => '7.0',
             :operatingsystemmajrelease => '7',
             :osfamily                  => osfamily,
             :puppetversion             => '3.7.0'
           }
         end
 
         describe "on supported osfamily: #{osfamily}" do
           it { is_expected.to contain_class('sudo::params') }
 
           it do
             is_expected.to contain_file('/etc/sudoers').with(
               'ensure'  => 'present',
               'owner'   => 'root',
               'group'   => 'root',
               'mode'    => '0440',
               'replace' => param_hash[:config_file_replace]
             )
           end
 
           it do
             is_expected.to contain_file('/etc/sudoers.d').with(
               'ensure'  => 'directory',
               'owner'   => 'root',
               'group'   => 'root',
               'mode'    => '0550',
               'recurse' => param_hash[:purge],
               'purge'   => param_hash[:purge]
             )
           end
 
           it do
             is_expected.to contain_class('sudo::package').with(
               'package'        => 'sudo',
               'package_ensure' => param_hash[:package_ensure]
             )
           end
         end
       end
 
       describe 'on RedHat 5.4' do
         let :facts do
           {
             :osfamily                  => 'RedHat',
             :operatingsystemrelease    => '5.4',
             :operatingsystemmajrelease => '5',
             :puppetversion             => '3.7.0'
           }
         end
 
         it do
           if params == {}
             is_expected.to contain_class('sudo::package').with(
               'package'        => 'sudo',
               'package_ensure' => 'latest'
             )
           else
             is_expected.to contain_class('sudo::package').with(
               'package'        => 'sudo',
               'package_ensure' => param_hash[:package_ensure]
             )
           end
         end
       end
 
       describe 'on supported osfamily: AIX' do
         let :facts do
           {
             :osfamily      => 'AIX',
             :puppetversion => '3.7.0'
           }
         end
 
         it { is_expected.to contain_class('sudo::params') }
 
         it do
           is_expected.to contain_file('/etc/sudoers').with(
             'ensure'  => 'present',
             'owner'   => 'root',
             'group'   => 'system',
             'mode'    => '0440',
             'replace' => param_hash[:config_file_replace]
           )
         end
 
         it do
           is_expected.to contain_file('/etc/sudoers.d').with(
             'ensure'  => 'directory',
             'owner'   => 'root',
             'group'   => 'system',
             'mode'    => '0550',
             'recurse' => param_hash[:purge],
             'purge'   => param_hash[:purge]
           )
         end
 
         it do
           is_expected.to contain_class('sudo::package').with(
             'package'        => 'sudo',
             'package_ensure' => param_hash[:package_ensure],
             'package_source' => 'http://www.sudo.ws/sudo/dist/packages/AIX/5.3/sudo-1.8.9-6.aix53.lam.rpm'
           )
         end
       end
 
       describe 'on supported osfamily: Solaris 10' do
         let :facts do
           {
             :operatingsystem => 'Solaris',
             :osfamily        => 'Solaris',
             :kernelrelease   => '5.10',
             :puppetversion   => '3.7.0',
             :hardwareisa     => 'i386'
           }
         end
 
         it { is_expected.to contain_class('sudo::params') }
 
         it do
           is_expected.to contain_file('/etc/sudoers').with(
             'ensure'  => 'present',
             'owner'   => 'root',
             'group'   => 'root',
             'mode'    => '0440',
             'replace' => param_hash[:config_file_replace]
           )
         end
 
         it do
           is_expected.to contain_file('/etc/sudoers.d').with(
             'ensure'  => 'directory',
             'owner'   => 'root',
             'group'   => 'root',
             'mode'    => '0550',
             'recurse' => param_hash[:purge],
             'purge'   => param_hash[:purge]
           )
         end
 
         it do
           is_expected.to contain_class('sudo::package').with(
             'package' => 'TCMsudo',
             'package_ensure' => param_hash[:package_ensure],
             'package_source' => 'http://www.sudo.ws/sudo/dist/packages/Solaris/10/TCMsudo-1.8.9p5-i386.pkg.gz',
             'package_admin_file' => '/var/sadm/install/admin/puppet'
           )
         end
 
         context 'when package is set' do
           let :params do
             {
               :package => 'mysudo'
             }
           end
 
           it do
             is_expected.to contain_class('sudo::package').with(
               'package' => 'mysudo'
               )
           end
         end
       end
 
       describe 'on supported osfamily: Solaris 11' do
         let :facts do
           {
             :operatingsystem => 'Solaris',
             :osfamily        => 'Solaris',
             :kernelrelease   => '5.11',
             :puppetversion   => '3.7.0'
           }
         end
 
         it { is_expected.to contain_class('sudo::params') }
 
         it do
           is_expected.to contain_file('/etc/sudoers').with(
             'ensure'  => 'present',
             'owner'   => 'root',
             'group'   => 'root',
             'mode'    => '0440',
             'replace' => param_hash[:config_file_replace]
           )
         end
 
         it do
           is_expected.to contain_file('/etc/sudoers.d').with(
             'ensure'  => 'directory',
             'owner'   => 'root',
             'group'   => 'root',
             'mode'    => '0550',
             'recurse' => param_hash[:purge],
             'purge'   => param_hash[:purge]
           )
         end
 
         it do
           is_expected.to contain_class('sudo::package').with(
             'package' => 'pkg://solaris/security/sudo',
             'package_ensure' => param_hash[:package_ensure]
           )
         end
       end
     end
   end
 end