Somewhere along the line (possibly my recent changes so that source resolution during Attr behaves correctly) this test lost an error.
Fix #1796.
Issue #1796: Add a test, and fix the test for #1177, which changed slightly.
Issue #1816: Add a test
Fix #1816