Changes for testing and benchmarking.