diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index 05fad4c87..7ffeaccac 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -1,94 +1,105 @@
 #!/usr/bin/env ruby
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/rails'
 require 'puppet/parser/interpreter'
 require 'puppet/parser/parser'
 require 'puppet/client'
 require 'puppettest'
 require 'puppettest/parsertesting'
 require 'puppettest/resourcetesting'
 require 'puppettest/railstesting'
 
 class TestRails < Test::Unit::TestCase
     include PuppetTest::ParserTesting
     include PuppetTest::ResourceTesting
     include PuppetTest::RailsTesting
 
     def test_includerails
         assert_nothing_raised {
             require 'puppet/rails'
         }
     end
 
     # Don't do any tests w/out this class
     if Puppet.features.rails?
     def setup
         super
         railsinit
     end
 
     def teardown
         super
         railsteardown
     end
 
     def test_hostcache
 	railsinit
         @interp, @scope, @source = mkclassframing
         # First make some objects
         resources = []
-        20.times { |i|
-            resources << mkresource(:type => "file", :title => "/tmp/file#{i.to_s}",
+        10.times { |i|
+            # Make a file
+            resources << mkresource(:type => "file",
+                :title => "/tmp/file#{i.to_s}",
                 :params => {:owner => "user#{i}"})
+
+            # And an exec, so we're checking multiple types
+            resources << mkresource(:type => "exec",
+                :title => "/bin/echo file#{i.to_s}",
+                :params => {})
         }
 
         # Now collect our facts
         facts = Facter.to_hash
 
         # Now try storing our crap
         host = nil
         assert_nothing_raised {
             host = Puppet::Rails::Host.store(
                 :resources => resources,
                 :facts => facts,
                 :name => facts["hostname"],
                 :classes => ["one", "two::three", "four"]
             )
         }
 
         assert(host, "Did not create host")
 
         host = nil
         assert_nothing_raised {
             host = Puppet::Rails::Host.find_by_name(facts["hostname"])
         }
         assert(host, "Could not find host object")
 
         assert(host.resources, "No objects on host")
 
         assert_equal(facts["hostname"], host.facts("hostname"),
             "Did not retrieve facts")
 
         count = 0
         host.resources.each do |resource|
+            assert_equal(host, resource.host)
             count += 1
             i = nil
             if resource[:title] =~ /file([0-9]+)/
                 i = $1
             else
                 raise "Got weird resource %s" % resource.inspect
             end
-            assert_equal("user#{i}", resource.parameters["owner"])
+            assert(resource[:type] != "", "Did not get a type from the resource")
+            if resource[:type] != "PuppetExec"
+                assert_equal("user#{i}", resource.parameters["owner"])
+            end
         end
 
         assert_equal(20, count, "Did not get enough resources")
     end
     else
         $stderr.puts "Install Rails for Rails and Caching tests"
     end
 end
 
 # $Id$