Add a test for scenarios touched in 7505

[easwars]

#7505 fixed a bug introduced in #7461. We should have a test for this.

[dfawley]

@easwars can you document some requirements for this test so we can have someone else write it if needed?