Resolve #3118590 "More tests"

This branch starts out with the fail test from comment 22 and a completely new test to help maintain backwards compatibility.