Rearrange test classes to the original order