fixed unit_tests