Fix (most) tests for Ruby 2.0