Fix bad refactor to make StaticsTest work