Update tests and add some benchmarks