Fix bugs
Remove unused test case