Fixed failing unittests