gh-1880 + tests

Closes #1880
I like explicit assertion counts. How about doing the same in the previous test?