wrap errors in pre tags
More tests (also fix tests)