Updated and refactored tests/benchmark.py