Also modifies all incremental cases using `#expect_error` to include the errors and notes which are expected.
These cover the fixes from the last few commits.