Fixed failing unittests.