Merge "Fix override warnings when two test suites share an output"