EDIT Test redesigned