fixing unittests step 2/?.