fixed failing unittests