reorganize tests and benchmarks