This adds a missing test for the behavior and also fixes variance in
test coverage between runs because the code that implements this
behavior sometimes ran and sometimes did not.