fixed unit test case failures