Rearrange test cases
Test inconsistency repair