Fixed success check for scenario 2