Merge "Remove a word 'smoke' from some scenario tests"