diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index e93ce10..10f72d9 100644
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -1,209 +1,215 @@
 require 'spec_helper_acceptance'
 
 case fact('osfamily')
 when 'AIX'
   username   = 'root'
   groupname  = 'system'
   scriptname = 'concatfragments.sh'
+  vardir     = default['puppetvardir']
 when 'Darwin'
   username   = 'root'
   groupname  = 'wheel'
   scriptname = 'concatfragments.sh'
+  vardir     = default['puppetvardir']
 when 'windows'
   username   = 'Administrator'
   groupname  = 'Administrators'
   scriptname = 'concatfragments.rb'
+  result     = on default, "echo #{default['puppetvardir']}"
+  vardir     = result.raw_output.chomp
 when 'Solaris'
   username   = 'root'
   groupname  = 'root'
   scriptname = 'concatfragments.rb'
+  vardir     = default['puppetvardir']
 else
   username   = 'root'
   groupname  = 'root'
   scriptname = 'concatfragments.sh'
+  vardir     = default['puppetvardir']
 end
 
 describe 'basic concat test' do
   basedir = default.tmpdir('concat')
-  safe_basedir = basedir.gsub('/','_')
+  safe_basedir = basedir.gsub(/[\/:]/,'_')
 
   shared_examples 'successfully_applied' do |pp|
     it 'applies the manifest twice with no stderr' do
       apply_manifest(pp, :catch_failures => true)
       apply_manifest(pp, :catch_changes => true)
     end
 
-    describe file("#{default['puppetvardir']}/concat") do
+    describe file("#{vardir}/concat") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 755
       }
     end
-     describe file("#{default['puppetvardir']}/concat/bin") do
+     describe file("#{vardir}/concat/bin") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 755
       }
     end
-    describe file("#{default['puppetvardir']}/concat/bin/#{scriptname}") do
+    describe file("#{vardir}/concat/bin/#{scriptname}") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 755
       }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 750
       }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file/fragments") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 750
       }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file/fragments.concat") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments.concat") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 640
       }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file/fragments.concat.out") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments.concat.out") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 640
       }
     end
   end
 
   context 'owner/group root' do
     before(:all) do
       pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
       EOS
       apply_manifest(pp)
     end
     pp = <<-EOS
       concat { '#{basedir}/file':
         owner => '#{username}',
         group => '#{groupname}',
         mode  => '0644',
       }
 
       concat::fragment { '1':
         target  => '#{basedir}/file',
         content => '1',
         order   => '01',
       }
 
       concat::fragment { '2':
         target  => '#{basedir}/file',
         content => '2',
         order   => '02',
       }
     EOS
 
     it_behaves_like 'successfully_applied', pp
 
     describe file("#{basedir}/file") do
       it { should be_file }
       it { should be_owned_by username }
       it { should be_grouped_into groupname }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 644
       }
       it { should contain '1' }
       it { should contain '2' }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file/fragments/01_1") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments/01_1") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 640
       }
     end
-    describe file("#{default['puppetvardir']}/concat/#{safe_basedir}_file/fragments/02_2") do
+    describe file("#{vardir}/concat/#{safe_basedir}_file/fragments/02_2") do
       it { should be_file }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
         should be_mode 640
       }
     end
   end
 
   context 'ensure' do
     context 'works when set to present with path set' do
       before(:all) do
         pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         EOS
         apply_manifest(pp)
       end
       pp="
         concat { 'file':
           ensure => present,
           path   => '#{basedir}/file',
           mode   => '0644',
         }
         concat::fragment { '1':
           target  => 'file',
           content => '1',
           order   => '01',
         }
       "
 
       it_behaves_like 'successfully_applied', pp
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it("should be mode", :unless => (fact('osfamily') == 'AIX')) {
           should be_mode 644
         }
         it { should contain '1' }
       end
     end
     context 'works when set to absent with path set' do
       before(:all) do
         pp = <<-EOS
         file { '#{basedir}':
           ensure => directory,
         }
         EOS
         apply_manifest(pp)
       end
       pp="
         concat { 'file':
           ensure => absent,
           path   => '#{basedir}/file',
           mode   => '0644',
         }
         concat::fragment { '1':
           target  => 'file',
           content => '1',
           order   => '01',
         }
       "
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should_not be_file }
       end
     end
   end
 end
diff --git a/spec/acceptance/deprecation_warnings_spec.rb b/spec/acceptance/deprecation_warnings_spec.rb
index 93ad411..7b0f5c5 100644
--- a/spec/acceptance/deprecation_warnings_spec.rb
+++ b/spec/acceptance/deprecation_warnings_spec.rb
@@ -1,233 +1,233 @@
 require 'spec_helper_acceptance'
 
 describe 'deprecation warnings' do
   basedir = default.tmpdir('concat')
 
   shared_examples 'has_warning'do |pp, w|
     it 'applies the manifest twice with a stderr regex' do
       expect(apply_manifest(pp, :catch_failures => true).stderr).to match(/#{Regexp.escape(w)}/m)
       expect(apply_manifest(pp, :catch_changes => true).stderr).to match(/#{Regexp.escape(w)}/m)
     end
   end
 
   context 'concat gnu parameter' do
     pp = <<-EOS
       concat { '#{basedir}/file':
         gnu => 'foo',
       }
       concat::fragment { 'foo':
         target  => '#{basedir}/file',
         content => 'bar',
       }
     EOS
     w = 'The $gnu parameter to concat is deprecated and has no effect'
 
     it_behaves_like 'has_warning', pp, w
   end
 
   context 'concat warn parameter =>' do
     ['true', 'yes', 'on'].each do |warn|
       context warn do
         pp = <<-EOS
           concat { '#{basedir}/file':
             warn => '#{warn}',
           }
           concat::fragment { 'foo':
             target  => '#{basedir}/file',
             content => 'bar',
           }
         EOS
         w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
 
         it_behaves_like 'has_warning', pp, w
 
         describe file("#{basedir}/file") do
           it { should be_file }
           it { should contain '# This file is managed by Puppet. DO NOT EDIT.' }
           it { should contain 'bar' }
         end
       end
     end
 
     ['false', 'no', 'off'].each do |warn|
       context warn do
         pp = <<-EOS
           concat { '#{basedir}/file':
             warn => '#{warn}',
           }
           concat::fragment { 'foo':
             target  => '#{basedir}/file',
             content => 'bar',
           }
         EOS
         w = 'Using stringified boolean values (\'true\', \'yes\', \'on\', \'false\', \'no\', \'off\') to represent boolean true/false as the $warn parameter to concat is deprecated and will be treated as the warning message in a future release'
 
         it_behaves_like 'has_warning', pp, w
 
         describe file("#{basedir}/file") do
           it { should be_file }
           it { should_not contain '# This file is managed by Puppet. DO NOT EDIT.' }
           it { should contain 'bar' }
         end
       end
     end
   end
 
   context 'concat::fragment ensure parameter' do
     context 'target file exists' do
       before(:all) do
         shell("/bin/echo 'file1 contents' > #{basedir}/file1")
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file1':
             content => "file1 contents\n",
           }
         EOS
         apply_manifest(pp)
       end
 
       pp = <<-EOS
         concat { '#{basedir}/file': }
         concat::fragment { 'foo':
           target => '#{basedir}/file',
           ensure => '#{basedir}/file1',
         }
       EOS
       w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
 
       it_behaves_like 'has_warning', pp, w
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it { should contain 'file1 contents' }
       end
 
-      describe 'the fragment can be changed from a symlink to a plain file' do
+      describe 'the fragment can be changed from a symlink to a plain file', :unless => (fact("osfamily") == "windows") do
         pp = <<-EOS
           concat { '#{basedir}/file': }
           concat::fragment { 'foo':
             target  => '#{basedir}/file',
             content => 'new content',
           }
         EOS
 
         it 'applies the manifest twice with no stderr' do
           apply_manifest(pp, :catch_failures => true)
           apply_manifest(pp, :catch_changes => true)
         end
 
         describe file("#{basedir}/file") do
           it { should be_file }
           it { should contain 'new content' }
           it { should_not contain 'file1 contents' }
         end
       end
     end # target file exists
 
     context 'target does not exist' do
       pp = <<-EOS
         concat { '#{basedir}/file': }
         concat::fragment { 'foo':
           target => '#{basedir}/file',
           ensure => '#{basedir}/file1',
         }
       EOS
       w = 'Passing a value other than \'present\' or \'absent\' as the $ensure parameter to concat::fragment is deprecated.  If you want to use the content of a file as a fragment please use the $source parameter.'
 
       it_behaves_like 'has_warning', pp, w
 
       describe file("#{basedir}/file") do
         it { should be_file }
       end
 
-      describe 'the fragment can be changed from a symlink to a plain file' do
+      describe 'the fragment can be changed from a symlink to a plain file', :unless => (fact('osfamily') == 'windows') do
         pp = <<-EOS
           concat { '#{basedir}/file': }
           concat::fragment { 'foo':
             target  => '#{basedir}/file',
             content => 'new content',
           }
         EOS
 
         it 'applies the manifest twice with no stderr' do
           apply_manifest(pp, :catch_failures => true)
           apply_manifest(pp, :catch_changes => true)
         end
 
         describe file("#{basedir}/file") do
           it { should be_file }
           it { should contain 'new content' }
         end
       end
     end # target file exists
 
   end # concat::fragment ensure parameter
 
   context 'concat::fragment mode parameter' do
     pp = <<-EOS
       concat { '#{basedir}/file': }
       concat::fragment { 'foo':
         target  => '#{basedir}/file',
         content => 'bar',
         mode    => 'bar',
       }
     EOS
     w = 'The $mode parameter to concat::fragment is deprecated and has no effect'
 
     it_behaves_like 'has_warning', pp, w
   end
 
   context 'concat::fragment owner parameter' do
     pp = <<-EOS
       concat { '#{basedir}/file': }
       concat::fragment { 'foo':
         target  => '#{basedir}/file',
         content => 'bar',
         owner   => 'bar',
       }
     EOS
     w = 'The $owner parameter to concat::fragment is deprecated and has no effect'
 
     it_behaves_like 'has_warning', pp, w
   end
 
   context 'concat::fragment group parameter' do
     pp = <<-EOS
       concat { '#{basedir}/file': }
       concat::fragment { 'foo':
         target  => '#{basedir}/file',
         content => 'bar',
         group   => 'bar',
       }
     EOS
     w = 'The $group parameter to concat::fragment is deprecated and has no effect'
 
     it_behaves_like 'has_warning', pp, w
   end
 
   context 'concat::fragment backup parameter' do
     pp = <<-EOS
       concat { '#{basedir}/file': }
       concat::fragment { 'foo':
         target  => '#{basedir}/file',
         content => 'bar',
         backup  => 'bar',
       }
     EOS
     w = 'The $backup parameter to concat::fragment is deprecated and has no effect'
 
     it_behaves_like 'has_warning', pp, w
   end
 
   context 'include concat::setup' do
     pp = <<-EOS
       include concat::setup
     EOS
     w = 'concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.'
 
     it_behaves_like 'has_warning', pp, w
   end
 
 end
diff --git a/spec/acceptance/replace_spec.rb b/spec/acceptance/replace_spec.rb
index c200cb2..cc30d12 100644
--- a/spec/acceptance/replace_spec.rb
+++ b/spec/acceptance/replace_spec.rb
@@ -1,256 +1,256 @@
 require 'spec_helper_acceptance'
 
 describe 'replacement of' do
   basedir = default.tmpdir('concat')
   context 'file' do
     context 'should not succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             content => "file exists\n"
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => false,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it { should contain 'file exists' }
         it { should_not contain '1' }
         it { should_not contain '2' }
       end
     end
 
     context 'should succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             content => "file exists\n"
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it { should_not contain 'file exists' }
         it { should contain '1' }
         it { should contain '2' }
       end
     end
   end # file
 
-  context 'symlink' do
+  context 'symlink', :unless => (fact("osfamily") == "windows") do
     context 'should not succeed' do
       # XXX the core puppet file type will replace a symlink with a plain file
       # when using ensure => present and source => ... but it will not when using
       # ensure => present and content => ...; this is somewhat confusing behavior
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => link,
             target => '#{basedir}/dangling',
           }
         EOS
         apply_manifest(pp)
       end
 
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => false,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       # XXX specinfra doesn't support be_linked_to on AIX
       describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX") do
         it { should be_linked_to "#{basedir}/dangling" }
       end
 
       describe file("#{basedir}/dangling") do
         # XXX serverspec does not have a matcher for 'exists'
         it { should_not be_file }
         it { should_not be_directory }
       end
     end
 
     context 'should succeed' do
       # XXX the core puppet file type will replace a symlink with a plain file
       # when using ensure => present and source => ... but it will not when using
       # ensure => present and content => ...; this is somewhat confusing behavior
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => link,
             target => '#{basedir}/dangling',
           }
         EOS
         apply_manifest(pp)
       end
 
       pp = <<-EOS
         concat { '#{basedir}/file':
           replace => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it { should contain '1' }
         it { should contain '2' }
       end
     end
   end # symlink
 
   context 'directory' do
     context 'should not succeed' do
       before(:all) do
         pp = <<-EOS
           file { '#{basedir}':
             ensure => directory,
           }
           file { '#{basedir}/file':
             ensure => directory,
           }
         EOS
         apply_manifest(pp)
       end
       pp = <<-EOS
         concat { '#{basedir}/file': }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with stderr for changing to file' do
         expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
         expect(apply_manifest(pp, :expect_failures => true).stderr).to match(/change from directory to file failed/)
       end
 
       describe file("#{basedir}/file") do
         it { should be_directory }
       end
     end
 
     # XXX concat's force param currently enables the creation of empty files
     # when there are no fragments, and the replace param will only replace
     # files and symlinks, not directories.  The semantics either need to be
     # changed, extended, or a new param introduced to control directory
     # replacement.
     context 'should succeed', :pending => 'not yet implemented' do
       pp = <<-EOS
         concat { '#{basedir}/file':
           force => true,
         }
 
         concat::fragment { '1':
           target  => '#{basedir}/file',
           content => '1',
         }
 
         concat::fragment { '2':
           target  => '#{basedir}/file',
           content => '2',
         }
       EOS
 
       it 'applies the manifest twice with no stderr' do
         apply_manifest(pp, :catch_failures => true)
         apply_manifest(pp, :catch_changes => true)
       end
 
       describe file("#{basedir}/file") do
         it { should be_file }
         it { should contain '1' }
       end
     end
   end # directory
 end