convert benchmarks to new run* style
convert tests to the new style