adjustments on ClassRunner