Merge "Remove redundant test expectation." into main