diff --git a/.fixtures.yml b/.fixtures.yml
index 56424bd..fef8d87 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,3 +1,8 @@
 fixtures:
   symlinks:
     cassandra: "#{source_dir}"
+  repositories:
+    apt: "git://github.com/puppetlabs/puppetlabs-apt"
+    firewall: "git://github.com/puppetlabs/puppetlabs-firewall"
+    inifile: "git://github.com/puppetlabs/puppetlabs-inifile"
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
diff --git a/spec/classes/datastax_agent_spec.rb b/spec/classes/datastax_agent_spec.rb
index 7f71f19..728a9ef 100644
--- a/spec/classes/datastax_agent_spec.rb
+++ b/spec/classes/datastax_agent_spec.rb
@@ -1,140 +1,128 @@
 require 'spec_helper'
 
 describe 'cassandra::datastax_agent' do
-  let(:pre_condition) do
-    [
-      'class cassandra() {}',
-      'define ini_setting($ensure = nil,
-         $path,
-         $section,
-         $key_val_separator       = nil,
-         $setting,
-         $value                   = nil) {}'
-    ]
-  end
-
   context 'Test for cassandra::datastax_agent with defaults (RedHat).' do
     let :facts do
       {
         osfamily: 'RedHat',
         operatingsystemmajrelease: 6
       }
     end
 
     it do
       is_expected.to have_resource_count(4)
 
       is_expected.to contain_class('cassandra::datastax_agent').only_with(
         'defaults_file'        => '/etc/default/datastax-agent',
         'package_ensure'       => 'present',
         'package_name'         => 'datastax-agent',
         'service_ensure'       => 'running',
         'service_enable'       => true,
         'service_name'         => 'datastax-agent',
         'stomp_interface'      => nil,
         'local_interface'      => nil
       )
 
       is_expected.to contain_package('datastax-agent').with(
         ensure: 'present',
         notify: 'Exec[datastax_agent_reload_systemctl]'
       ).that_notifies('Exec[datastax_agent_reload_systemctl]')
 
       is_expected.to contain_exec('datastax_agent_reload_systemctl').only_with(
         command: '/usr/bin/systemctl daemon-reload',
         onlyif: 'test -x /usr/bin/systemctl',
         path: ['/usr/bin', '/bin'],
         refreshonly: true,
         notify: 'Service[datastax-agent]'
       ).that_notifies('Service[datastax-agent]')
 
       is_expected.to contain_file('/var/lib/datastax-agent/conf/address.yaml').
         with(
           owner: 'cassandra',
           group: 'cassandra',
           mode: '0644'
         ).that_requires('Package[datastax-agent]')
 
       is_expected.to contain_service('datastax-agent').only_with(
         ensure: 'running',
         enable: true,
         name: 'datastax-agent'
       )
     end
   end
 
   context 'Test for cassandra::datastax_agent with defaults (Debian).' do
     let :facts do
       {
         osfamily: 'Debian',
         operatingsystemmajrelease: 6
       }
     end
 
     it do
       is_expected.to contain_exec('datastax_agent_reload_systemctl').with(
         command: '/bin/systemctl daemon-reload',
         onlyif: 'test -x /bin/systemctl',
         path: ['/usr/bin', '/bin'],
         refreshonly: true
       ).that_notifies('Service[datastax-agent]')
     end
   end
 
   context 'Test that the JAVA_HOME can be set.' do
     let :facts do
       {
         osfamily: 'Debian',
         operatingsystemmajrelease: 6
       }
     end
 
     let :params do
       {
         java_home: '/usr/lib/jvm/java-8-oracle'
       }
     end
 
     it do
       is_expected.to contain_ini_setting('java_home').with(
         ensure: 'present',
         path: '/etc/default/datastax-agent',
         section: '',
         key_val_separator: '=',
         setting: 'JAVA_HOME',
         value: '/usr/lib/jvm/java-8-oracle'
       ).that_notifies('Service[datastax-agent]')
     end
   end
 
   context 'Test settings.' do
     let :facts do
       {
         osfamily: 'Debian',
         operatingsystemmajrelease: 6
       }
     end
 
     let :params do
       {
         settings: {
           'agent_alias' => {
             'setting' => 'agent_alias',
             'value'   => 'foobar'
           },
           'stomp_interface' => {
             'setting' => 'stomp_interface',
             'value'   => 'localhost'
           },
           'async_pool_size' => {
             'ensure' => 'absent'
           }
         }
       }
     end
 
     it do
-      is_expected.to have_resource_count(4)
+      is_expected.to have_resource_count(7)
     end
   end
 end
diff --git a/spec/classes/firewall_ports_spec.rb b/spec/classes/firewall_ports_spec.rb
index ff316f4..c808c7f 100644
--- a/spec/classes/firewall_ports_spec.rb
+++ b/spec/classes/firewall_ports_spec.rb
@@ -1,30 +1,23 @@
 require 'spec_helper'
 describe 'cassandra::firewall_ports' do
-  let(:pre_condition) do
-    [
-      'class cassandra () {}',
-      'define firewall ($action, $dport, $proto, $source) {}'
-    ]
-  end
-
   context 'Run with defaults.' do
     it do
       is_expected.to have_resource_count(2)
       is_expected.to contain_firewall('200 - Cassandra (Public) - 0.0.0.0/0')
 
       is_expected.to contain_class('cassandra::firewall_ports').with(
         client_ports: [9042, 9160],
         client_subnets: ['0.0.0.0/0'],
         inter_node_ports: [7000, 7001, 7199],
         inter_node_subnets: ['0.0.0.0/0'],
         public_ports: [8888],
         public_subnets: ['0.0.0.0/0'],
         ssh_port: 22,
         opscenter_ports: [9042, 9160, 61_620, 61_621],
         opscenter_subnets: ['0.0.0.0/0']
       )
 
       is_expected.to contain_cassandra__private__firewall_ports__rule('200_Public_0.0.0.0/0').with(ports: [8888, 22])
     end
   end
 end
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 0c4e888..52680f3 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -1,403 +1,403 @@
 require 'spec_helper'
 
 describe 'cassandra' do
   let(:pre_condition) do
     [
       'class apt () {}',
       'class apt::update () {}',
       'define apt::key ($id, $source) {}',
       'define apt::source ($location, $comment, $release, $include) {}',
       'define ini_setting($ensure = nil,
          $path,
          $section,
          $key_val_separator       = nil,
          $setting,
          $value                   = nil) {}'
     ]
   end
 
   context 'On an unknown OS with defaults for all parameters' do
     let :facts do
       {
         operatingsystemmajrelease: 10,
         osfamily: 'Darwin'
       }
     end
 
     it { is_expected.to raise_error(Puppet::Error) }
   end
 
   context 'Test the default parameters (RedHat)' do
     let :facts do
       {
         osfamily: 'RedHat',
         operatingsystemmajrelease: 7
       }
     end
 
     it do
       is_expected.to contain_package('cassandra').with(
         ensure: 'present',
         name: 'cassandra22'
       ).that_notifies('Exec[cassandra_reload_systemctl]')
 
       is_expected.to contain_exec('cassandra_reload_systemctl').only_with(
         command: '/usr/bin/systemctl daemon-reload',
         onlyif: 'test -x /usr/bin/systemctl',
         path: ['/usr/bin', '/bin'],
         refreshonly: true
       )
 
       is_expected.to contain_file('/etc/cassandra/default.conf').with(
         ensure: 'directory',
         group: 'cassandra',
         owner: 'cassandra',
         mode: '0755'
       ).that_requires('Package[cassandra]')
 
       is_expected.to contain_file('/etc/cassandra/default.conf/cassandra.yaml').
         with(
           ensure: 'present',
           owner: 'cassandra',
           group: 'cassandra',
           mode: '0644'
         ).
         that_requires('Package[cassandra]')
 
       is_expected.to contain_class('cassandra').only_with(
         baseline_settings: {},
         cassandra_2356_sleep_seconds: 5,
         cassandra_9822: false,
         cassandra_yaml_tmpl: 'cassandra/cassandra.yaml.erb',
         commitlog_directory_mode: '0750',
         config_file_mode: '0644',
         config_path: '/etc/cassandra/default.conf',
         data_file_directories_mode: '0750',
         dc: 'DC1',
         fail_on_non_supported_os: true,
         hints_directory_mode: '0750',
         package_ensure: 'present',
         package_name: 'cassandra22',
         rack: 'RAC1',
         rackdc_tmpl: 'cassandra/cassandra-rackdc.properties.erb',
         saved_caches_directory_mode: '0750',
         service_enable: true,
         service_name: 'cassandra',
         service_provider: nil,
         service_refresh: true,
         settings: {},
         systemctl: '/usr/bin/systemctl'
       )
     end
   end
 
   context 'On RedHat 7 with data directories specified.' do
     let :facts do
       {
         osfamily: 'RedHat',
         operatingsystemmajrelease: 7
       }
     end
 
     let :params do
       {
         commitlog_directory: '/var/lib/cassandra/commitlog',
         data_file_directories: ['/var/lib/cassandra/data'],
         hints_directory: '/var/lib/cassandra/hints',
         saved_caches_directory: '/var/lib/cassandra/saved_caches',
         settings: { 'cluster_name' => 'MyCassandraCluster' }
       }
     end
 
     it do
       is_expected.to have_resource_count(10)
       is_expected.to contain_file('/var/lib/cassandra/commitlog')
       is_expected.to contain_file('/var/lib/cassandra/data')
       is_expected.to contain_file('/var/lib/cassandra/hints')
       is_expected.to contain_file('/var/lib/cassandra/saved_caches')
     end
   end
 
   context 'On RedHat 7 with service provider set to init.' do
     let :facts do
       {
         osfamily: 'RedHat',
-        operatingsystemmajrelease: 7
+        operatingsystemmajrelease: '7'
       }
     end
 
     let :params do
       {
         service_provider: 'init'
       }
     end
 
     it do
       is_expected.to have_resource_count(7)
       is_expected.to contain_exec('/sbin/chkconfig --add cassandra').with(
         unless: '/sbin/chkconfig --list cassandra'
       ).
         that_requires('Package[cassandra]').
         that_comes_before('Service[cassandra]')
     end
   end
 
   context 'On a Debian OS with defaults for all parameters' do
     let :facts do
       {
         operatingsystemmajrelease: 8,
         osfamily: 'Debian'
       }
     end
 
     it do
       is_expected.to contain_class('cassandra')
       is_expected.to contain_group('cassandra').with_ensure('present')
 
       is_expected.to contain_package('cassandra').with(
         ensure: 'present',
         name: 'cassandra'
       ).that_notifies('Exec[cassandra_reload_systemctl]')
 
       is_expected.to contain_exec('cassandra_reload_systemctl').only_with(
         command: '/bin/systemctl daemon-reload',
         onlyif: 'test -x /bin/systemctl',
         path: ['/usr/bin', '/bin'],
         refreshonly: true
       )
 
       is_expected.to contain_service('cassandra').with(
         ensure: nil,
         name: 'cassandra',
         enable: 'true'
       )
 
       is_expected.to contain_exec('CASSANDRA-2356 sleep').
         with(
           command: '/bin/sleep 5',
           refreshonly: true,
           user: 'root'
         ).
         that_subscribes_to('Package[cassandra]').
         that_comes_before('Service[cassandra]')
 
       is_expected.to contain_user('cassandra').
         with(
           ensure: 'present',
           comment: 'Cassandra database,,,',
           gid: 'cassandra',
           home: '/var/lib/cassandra',
           shell: '/bin/false',
           managehome: true
         ).
         that_requires('Group[cassandra]')
 
       is_expected.to contain_file('/etc/cassandra').with(
         ensure: 'directory',
         group: 'cassandra',
         owner: 'cassandra',
         mode: '0755'
       )
 
       is_expected.to contain_file('/etc/cassandra/cassandra.yaml').
         with(
           ensure: 'present',
           owner: 'cassandra',
           group: 'cassandra',
           mode: '0644'
         ).
         that_comes_before('Package[cassandra]').
         that_requires(['User[cassandra]', 'File[/etc/cassandra]'])
 
       is_expected.to contain_file('/etc/cassandra/cassandra-rackdc.properties').
         with(
           ensure: 'file',
           owner: 'cassandra',
           group: 'cassandra',
           mode: '0644'
         ).
         that_requires(['File[/etc/cassandra]', 'User[cassandra]']).
         that_comes_before('Package[cassandra]')
 
       is_expected.to contain_service('cassandra').
         that_subscribes_to(
           [
             'File[/etc/cassandra/cassandra.yaml]',
             'File[/etc/cassandra/cassandra-rackdc.properties]',
             'Package[cassandra]'
           ]
         )
     end
   end
 
   context 'CASSANDRA-9822 activated on Debian' do
     let :facts do
       {
         operatingsystemmajrelease: 7,
         osfamily: 'Debian',
         lsbdistid: 'Ubuntu',
         lsbdistrelease: '14.04'
       }
     end
 
     let :params do
       {
         cassandra_9822: true
       }
     end
 
     it do
       is_expected.to contain_file('/etc/init.d/cassandra').with(
         source: 'puppet:///modules/cassandra/CASSANDRA-9822/cassandra',
         mode: '0555'
       ).that_comes_before('Package[cassandra]')
     end
   end
 
   context 'Install DSE on a Red Hat family OS.' do
     let :facts do
       {
         operatingsystemmajrelease: 7,
         osfamily: 'RedHat'
       }
     end
 
     let :params do
       {
         package_ensure: '4.7.0-1',
         package_name: 'dse-full',
         config_path: '/etc/dse/cassandra',
         service_name: 'dse'
       }
     end
 
     it do
       is_expected.to contain_file('/etc/dse/cassandra/cassandra.yaml').that_notifies('Service[cassandra]')
       is_expected.to contain_file('/etc/dse/cassandra')
 
       is_expected.to contain_file('/etc/dse/cassandra/cassandra-rackdc.properties').
         with(
           ensure: 'file',
           owner: 'cassandra',
           group: 'cassandra',
           mode: '0644'
         ).
         that_notifies('Service[cassandra]')
 
       is_expected.to contain_package('cassandra').with(
         ensure: '4.7.0-1',
         name: 'dse-full'
       )
       is_expected.to contain_service('cassandra').with_name('dse')
     end
   end
 
   context 'On an unsupported OS pleading tolerance' do
     let :facts do
       {
         operatingsystemmajrelease: 10,
         osfamily: 'Darwin'
       }
     end
     let :params do
       {
         config_file_mode: '0755',
         config_path: '/etc/cassandra',
         fail_on_non_supported_os: false,
         package_name: 'cassandra',
         service_provider: 'base',
         systemctl: '/bin/true'
       }
     end
 
     it do
       is_expected.to contain_file('/etc/cassandra/cassandra.yaml').with('mode' => '0755')
       is_expected.to contain_service('cassandra').with(provider: 'base')
       is_expected.to have_resource_count(6)
     end
   end
 
   context 'Ensure cassandra service can be stopped and disabled.' do
     let :facts do
       {
         operatingsystemmajrelease: 8,
         osfamily: 'Debian'
       }
     end
 
     let :params do
       {
         service_ensure: 'stopped',
         service_enable: 'false'
       }
     end
 
     it do
       is_expected.to contain_service('cassandra').
         with(ensure: 'stopped',
              name: 'cassandra',
              enable: 'false')
     end
   end
 
   context 'Test the dc and rack properties with defaults (Debian).' do
     let :facts do
       {
         operatingsystemmajrelease: 8,
         osfamily: 'Debian'
       }
     end
 
     it do
       is_expected.to contain_file('/etc/cassandra/cassandra-rackdc.properties').
         with_content(%r{^dc=DC1}).
         with_content(%r{^rack=RAC1$}).
         with_content(%r{^#dc_suffix=$}).
         with_content(%r{^# prefer_local=true$})
     end
   end
 
   context 'Test the dc and rack properties with defaults (RedHat).' do
     let :facts do
       {
         operatingsystemmajrelease: 7,
         osfamily: 'RedHat'
       }
     end
 
     it do
       is_expected.to contain_file('/etc/cassandra/default.conf/cassandra-rackdc.properties').
         with_content(%r{^dc=DC1}).
         with_content(%r{^rack=RAC1$}).
         with_content(%r{^#dc_suffix=$}).
         with_content(%r{^# prefer_local=true$})
     end
   end
 
   context 'Test the dc and rack properties.' do
     let :facts do
       {
         operatingsystemmajrelease: 7,
         osfamily: 'RedHat'
       }
     end
 
     let :params do
       {
         snitch_properties_file: 'cassandra-topology.properties',
         dc: 'NYC',
         rack: 'R101',
         dc_suffix: '_1_cassandra',
         prefer_local: 'true'
       }
     end
 
     it do
       is_expected.to contain_file('/etc/cassandra/default.conf/cassandra-topology.properties').
         with_content(%r{^dc=NYC$}).
         with_content(%r{^rack=R101$}).
         with_content(%r{^dc_suffix=_1_cassandra$}).
         with_content(%r{^prefer_local=true$})
     end
   end
 end
diff --git a/spec/defines/file_spec.rb b/spec/defines/file_spec.rb
index 2fbc8f4..9dab736 100644
--- a/spec/defines/file_spec.rb
+++ b/spec/defines/file_spec.rb
@@ -1,52 +1,39 @@
 require 'spec_helper'
 
 describe '::cassandra::file' do
-  let(:pre_condition) do
-    [
-      'class stdlib () {}',
-      'define ini_setting($ensure = nil,
-         $path,
-         $section,
-         $key_val_separator       = nil,
-         $setting,
-         $value                   = nil) {}',
-      'define file_line($line, $path, $match) {}'
-    ]
-  end
-
   context 'On a Debian OS set the max and new heap size' do
     let :facts do
       {
         osfamily: 'Debian',
         operatingsystemmajrelease: 8
       }
     end
 
     let(:title) { 'cassandra-env.sh' }
 
     let :params do
       {
         config_path: '/etc/cassandra',
         'file_lines' => {
           'MAX_HEAP_SIZE 4GB' => {
             'line'  => 'MAX_HEAP_SIZE="4G"',
             'match' => '^#MAX_HEAP_SIZE="4G"$'
           }
         }
       }
     end
 
     it do
       is_expected.to contain_class('cassandra')
       is_expected.to contain_class('cassandra::params')
       is_expected.to contain_class('stdlib')
       is_expected.to contain_cassandra__file('cassandra-env.sh')
 
       is_expected.to contain_file_line('MAX_HEAP_SIZE 4GB').with(
         path: '/etc/cassandra/cassandra-env.sh',
         line: 'MAX_HEAP_SIZE="4G"',
         match: '^#MAX_HEAP_SIZE="4G"$'
       )
     end
   end
 end