Fix test for issue 610
3 files changed