Fix unit test and benchmark unit-tests