Cleaned up the benchmark tests