iMore fixes for defects unittests.