Corrected test cases to the new changes.