redesigned tests