refactor out a broken benchmark class