Support rubinius (perhaps some cleanup required)
Fix test