Merge "Don't skip tests which lack non-tidy output"