Remove preprocessing.
Remove globals by using class-defined stage.
Consolidate diffavg tests (remove test 5), reduce bottleneck in test 4.