Rework tests