Merge "Add more console output log for scenario tests"