Tests from #4193

I closed #4193 in favor of your pull request (#3927) but thought you might find these tests useful.