fixing failing unittests