diff --git a/spec/acceptance/concat_spec.rb b/spec/acceptance/concat_spec.rb
index 70b1a6d..7cec1a5 100644
--- a/spec/acceptance/concat_spec.rb
+++ b/spec/acceptance/concat_spec.rb
@@ -1,215 +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(/[\/:]/,'_')
 
   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("#{vardir}/concat") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
         should be_mode 755
       }
     end
      describe file("#{vardir}/concat/bin") do
       it { should be_directory }
       it { should be_owned_by username }
       it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
         should be_mode 755
       }
     end
     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' or fact('osfamily') == 'windows')) {
         should be_mode 755
       }
     end
     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' or fact('osfamily') == 'windows')) {
         should be_mode 750
       }
     end
     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' or fact('osfamily') == 'windows')) {
         should be_mode 750
       }
     end
     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' or fact('osfamily') == 'windows')) {
         should be_mode 640
       }
     end
     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' or fact('osfamily') == 'windows')) {
         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 group", :unless => (fact('osfamily') == 'windows')) { should be_grouped_into groupname }
       it("should be mode", :unless => (fact('osfamily') == 'AIX' or fact('osfamily') == 'windows')) {
         should be_mode 644
       }
       it { should contain '1' }
       it { should contain '2' }
     end
     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' or fact('osfamily') == 'windows')) {
         should be_mode 640
       }
     end
     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' or fact('osfamily') == 'windows')) {
         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' or fact('osfamily') == 'windows')) {
           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/replace_spec.rb b/spec/acceptance/replace_spec.rb
index cc30d12..6882345 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', :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
+      describe file("#{basedir}/file"), :unless => (fact("osfamily") == "AIX" or fact("osfamily") == "windows") 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