REVIEW-4299 Better test coverage and tweaks to test result aggregation.