Merge "Replace "hardcode" in scenario tests"