Consistent function syntax for tests.
Consistent function syntax in benchmarks.