Rework tests so that they are more consistent