minor fixes in unittests