Reworking tests.