Tidy up indices
Remove verbosity parameter in tests and benchmarks

Default is 3 on master node.