fix test case issues