Rearrange performance tests