Add unit tests to check that instance methods as the error handler work properly.
Merge branch 'lowjoel-fix-2113' into lowjoel-drupal7