Update: more idiomatic tests
Add: benchmarks