Rearrange tests and benchmarks