Keep only minimal erroneous tests
Refactor some benchmarks