redesigned some corrected test cases