Improved regression test for bug 931.