fixing unittests step 3/?.