Update test files for issue 6211