diff --git a/spec/unit/transaction.rb b/spec/unit/transaction.rb
index b419d4e71..ff01eac22 100755
--- a/spec/unit/transaction.rb
+++ b/spec/unit/transaction.rb
@@ -1,136 +1,136 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../spec_helper'
 
 require 'puppet/transaction'
 
 describe Puppet::Transaction do
     it "should match resources by name, not title, when prefetching" do
         @catalog = Puppet::Resource::Catalog.new
         @transaction = Puppet::Transaction.new(@catalog)
 
         # Have both a title and name
         resource = Puppet::Type.type(:sshkey).create :title => "foo", :name => "bar", :type => :dsa, :key => "eh"
         @catalog.add_resource resource
 
         resource.provider.class.expects(:prefetch).with("bar" => resource)
 
         @transaction.prefetch
     end
 
     describe "when generating resources" do
         it "should finish all resources" do
-            generator = stub 'generator', :depthfirst? => true
-            resource = stub 'resource'
+            generator = stub 'generator', :depthfirst? => true, :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
 
             generator.expects(:generate).returns [resource]
 
             @catalog.expects(:add_resource).yields(resource)
 
             resource.expects(:finish)
 
             @transaction.generate_additional_resources(generator, :generate)
         end
 
         it "should skip generated resources that conflict with existing resources" do
-            generator = mock 'generator'
-            resource = stub 'resource'
+            generator = mock 'generator', :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
 
             generator.expects(:generate).returns [resource]
 
             @catalog.expects(:add_resource).raises(Puppet::Resource::Catalog::DuplicateResourceError.new("foo"))
 
             resource.expects(:finish).never
             resource.expects(:info) # log that it's skipped
 
             @transaction.generate_additional_resources(generator, :generate).should be_empty
         end
 
         it "should copy all tags to the newly generated resources" do
             child = stub 'child'
             generator = stub 'resource', :tags => ["one", "two"]
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
 
             generator.stubs(:generate).returns [child]
             @catalog.stubs(:add_resource)
 
             child.expects(:tag).with("one", "two")
 
             @transaction.generate_additional_resources(generator, :generate)
         end
     end
 
     describe "when skipping a resource" do
         before :each do
             @resource = stub_everything 'res'
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
         end
 
         it "should skip resource with missing tags" do
             @transaction.stubs(:missing_tags?).returns(true)
             @transaction.skip?(@resource).should be_true
         end
 
         it "should ask the resource if it's tagged with any of the tags" do
             tags = ['one', 'two']
             @transaction.stubs(:ignore_tags?).returns(false)
             @transaction.stubs(:tags).returns(tags)
 
             @resource.expects(:tagged?).with(*tags).returns(true)
 
             @transaction.missing_tags?(@resource).should be_false
         end
 
         it "should skip not scheduled resources" do
             @transaction.stubs(:scheduled?).returns(false)
             @transaction.skip?(@resource).should be_true
         end
 
         it "should skip resources with failed dependencies" do
             @transaction.stubs(:failed_dependencies?).returns(false)
             @transaction.skip?(@resource).should be_true
         end
 
         it "should skip virtual resource" do
             @resource.stubs(:virtual?).returns true
             @transaction.skip?(@resource).should be_true
         end
     end
 end
 
 describe Puppet::Transaction, " when determining tags" do
     before do
         @config = Puppet::Resource::Catalog.new
         @transaction = Puppet::Transaction.new(@config)
     end
 
     it "should default to the tags specified in the :tags setting" do
         Puppet.expects(:[]).with(:tags).returns("one")
         @transaction.tags.should == %w{one}
     end
 
     it "should split tags based on ','" do
         Puppet.expects(:[]).with(:tags).returns("one,two")
         @transaction.tags.should == %w{one two}
     end
 
     it "should use any tags set after creation" do
         Puppet.expects(:[]).with(:tags).never
         @transaction.tags = %w{one two}
         @transaction.tags.should == %w{one two}
     end
 
     it "should always convert assigned tags to an array" do
         @transaction.tags = "one::two"
         @transaction.tags.should == %w{one::two}
     end
 end