Fix test cases
Removed obsolete test cases