fixing_unit_tests