diff --git a/spec/fixtures/unit/indirector/hiera/global.yaml b/spec/fixtures/unit/indirector/hiera/global.yaml
new file mode 100644
index 000000000..0853e0ec1
--- /dev/null
+++ b/spec/fixtures/unit/indirector/hiera/global.yaml
@@ -0,0 +1,10 @@
+---
+integer: 3000
+string: 'apache'
+hash:
+  user:  'Hightower'
+  group: 'admin'
+  mode:  '0644'
+array:
+ - '0.ntp.puppetlabs.com'
+ - '1.ntp.puppetlabs.com'
diff --git a/spec/unit/indirector/hiera_spec.rb b/spec/unit/indirector/hiera_spec.rb
index 7cb0b0d9d..ce03c68ba 100644
--- a/spec/unit/indirector/hiera_spec.rb
+++ b/spec/unit/indirector/hiera_spec.rb
@@ -1,48 +1,94 @@
 require 'spec_helper'
 require 'puppet/indirector/hiera'
 
 describe Puppet::Indirector::Hiera do
+  include PuppetSpec::Files
+
   before do
     Puppet.settings[:hiera_config] = {}
     Puppet::Indirector::Terminus.stubs(:register_terminus_class)
     Puppet::Indirector::Indirection.stubs(:instance).returns(indirection)
 
     module Testing; end
     @hiera_class = class Testing::Hiera < Puppet::Indirector::Hiera
       self
     end
   end
 
   let(:model)   { mock('model') }
   let(:options) { {:host => 'foo' } }
-  let(:request) { stub('request', :key => "port", :options => options) }
+
+  let(:request_integer) do
+    stub('request', :key => "integer", :options => options)
+  end
+
+  let(:request_string) do
+    stub('request', :key => "string", :options => options)
+  end
+
+  let(:request_array) do
+    stub('request', :key => "array", :options => options)
+  end
+
+  let(:request_hash) do
+    stub('request', :key => "hash", :options => options)
+  end
+
   let(:indirection) do
     stub('indirection', :name => :none, :register_terminus_type => nil,
       :model => model)
   end
 
   let(:facts) do
     { 'fqdn' => 'agent.testing.com' }
   end
   let(:facter_obj) { stub(:values => facts) }
 
   it "should not be the default data_binding terminus" do
     Puppet.settings[:data_binding_terminus].should_not == 'hiera'
   end
 
   it "should raise an error if we don't have the hiera feature" do
     Puppet.features.expects(:hiera?).returns(false)
     lambda { @hiera_class.new }.should raise_error RuntimeError,
       "Hiera terminus not supported without hiera gem"
   end
 
-  describe "the behavior of the find method" do
-    it "should lookup the requested key in hiera", :if => Puppet.features.hiera? do
-      Hiera.any_instance.expects(:lookup).with("port", nil, facts, nil, nil).returns('3000')
-      Puppet::Node::Facts.indirection.expects(:find).with('foo').returns(facter_obj)
+  describe "the behavior of the find method", :if => Puppet.features.hiera? do
+    before do
+      Puppet.settings[:hiera_config] = {
+        :yaml      => { :datadir => datadir },
+        :hierarchy => ['global'],
+        :logger    => 'noop'
+      }
+      Puppet::Node::Facts.indirection.expects(:find).with('foo').
+        returns(facter_obj)
+    end
+
+    let(:datadir)     { my_fixture_dir }
+    let(:data_binder) { @hiera_class.new }
+
+    it "support looking up an integer" do
+      data_binder.find(request_integer).should == 3000
+    end
+
+    it "should support looking up a string" do
+      data_binder.find(request_string).should == 'apache'
+    end
+
+    it "should support looking up an array" do
+      data_binder.find(request_array).should == [
+        '0.ntp.puppetlabs.com',
+        '1.ntp.puppetlabs.com',
+      ]
+    end
 
-      data_binder = @hiera_class.new
-      data_binder.find(request).should == '3000'
+    it "should support looking up a hash" do
+      data_binder.find(request_hash).should == {
+        'user'  => 'Hightower',
+        'group' => 'admin',
+        'mode'  => '0644'
+      }
     end
   end
 end