EDIT Test design improved