Fix failing testsuite

Not verified with `rake osc:build` as I'm getting remote errors from build service.