gh-1880 + tests

Closes #1880
Oh, sorry! This is what I get for running the test in isolation. I'm glad I know about this now--this is definitely something I would like to address in the future. Anyway, carry on