Fix benchmarks

There was a bug from over-generalization of the various test types. The scripts are correct now.