#6026 - fix tests that failed without zlib
7 files changed