Few test cases in 8019476 already pass due to recent fixes under 8019398 as well as other fixes. But we'd like to add a regression test for these cases.