test improvement
improve success logic depending of action