Fixed unit-tests (at least for ruby 1.9.3)