Fixups after crunch.test and crunch.benchmarking changes