Testing/benchmarking updates