Improve test for #474.