Fix some test failures when Configured with zlib