Merge "Use rand name in common function in scenario tests"