More changes for bench test.