diff --git a/lib/flexmock/composite_expectation.rb b/lib/flexmock/composite_expectation.rb
index 370046f..fbc8e54 100644
--- a/lib/flexmock/composite_expectation.rb
+++ b/lib/flexmock/composite_expectation.rb
@@ -16,9 +16,9 @@ def add(expectation)
     end
 
     # Apply the constraint method to all expectations in the composite.
-    def method_missing(sym, *args, &block)
+    def method_missing(sym, *args, **keywords, &block)
       @expectations.each do |expectation|
-        expectation.send(sym, *args, &block)
+        expectation.send(sym, *args, **keywords, &block)
       end
       self
     end
diff --git a/test/partial_mock_test.rb b/test/partial_mock_test.rb
index 065ecb5..3564db3 100644
--- a/test/partial_mock_test.rb
+++ b/test/partial_mock_test.rb
@@ -634,7 +634,8 @@ def test_partial_mocks_leaves_NoMethodError_exceptions_raised_by_the_original_me
     exception = assert_raises(NameError) do
         obj.mocked_method
     end
-    assert_equal "undefined method `does_not_exist' for #{obj}", exception.message
+    assert(/undefined method `does_not_exist' for #<#<Class:/ === exception.message, 
+        "expected #{exception.message} to match /undefined method `does_not_exist' for #<#<Class:/")
   end
 
   def test_it_checks_whether_mocks_are_forbidden_before_forwarding_the_call
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9eb3310..c4fd622 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -50,7 +50,7 @@ def assert_failure(klass, options={}, &block)
     # added.
     def assert_mock_failure(klass, options={}, &block)
       ex = assert_failure(klass, options, &block)
-      file = eval("__FILE__", block.binding)
+      file = block.binding.source_location.first
       assert_matching_line(ex, file, options)
     end