Remove unused test file
Fix test cases