Sort events Cuke test added. Event steps modified accordingly.