Fix yet more Ruby test failures