fix test cases after cleanup