more work on benchmark infrastructure