Redesigned tests