Merge "Remove unused variables from scenario tests"