Updates to benchmark tests