Correction of test cases for 24474 issue