Add testcase for #1026
Tweaks to 1026 test case.