Corrections to test for issue 560