Merge "Modify scenario tests"