Completely rewrite benchmarks
Add todo note to restore a useful test