Add more tests for benchmark.
Switch to using FunctionTests to allow committing objects in intervals.