The placement of cases under testing is a bit messy, and cases of the same type need to be merged

The placement of cases under testing is a bit messy, and cases of the same type need to be merged #5846