fixing unittests step 1/?.