Update test files for issue 5440