diff --git a/lib/webrat/core/form.rb b/lib/webrat/core/form.rb
index 847b159..4522710 100644
--- a/lib/webrat/core/form.rb
+++ b/lib/webrat/core/form.rb
@@ -105,7 +105,7 @@ module Webrat
     def merge_hash_values(a, b) # :nodoc:
       a.keys.each do |k|
         if b.has_key?(k)
-          case [a[k], b[k]].map(&:class)
+          case [a[k], b[k]].map{|value| value.class}
           when [Hash, Hash]
             a[k] = merge_hash_values(a[k], b[k])
             b.delete(k)
diff --git a/lib/webrat/merb.rb b/lib/webrat/merb.rb
index 1684545..a55cf94 100644
--- a/lib/webrat/merb.rb
+++ b/lib/webrat/merb.rb
@@ -1,3 +1,7 @@
+Dir[File.join(File.dirname(__FILE__), "merb", "*.rb")].sort.each do |file|
+  require File.expand_path(file)
+end
+
 module Webrat
   class Session
     include Merb::Test::RequestHelper