Reorganize tests and benchmarks