Rearrange test folders