Merge "Improve OutputPage test coverage more"