Improve test #620