Fixes some unittests