Update the benchmark test suite
Fixes #21