Corrected and updated test cases