Fix oraclejdk7 test failures, rspec deprecations, and improve error messages slightly