Ignore the HTML output files
Trivial formatting changes in tests
Check for consistency also in blocks, refactor a bit