Upgrade to RSpec 2
Fix more Ruby test failures