Merge "CE: Cleanup some comments in OutputTest"