Made unit-tests pass unter ruby 1.9.3, 1.8.7 and 2.1.2