Rework tests.