Removed test cases for restructuring #119