Fix failing unittests that were broken by pull request #17.