reworking tests