Added hot-fix to make the tests pass again (see #5).