gh-1880 + tests

Closes #1880
It doesn't look like these two stubs are necessary for this test. Is that right?