added (x|->y):S to list of constraints + tests