Rearranged some tests and added benchmarks