move zlib wrappers from the tests to new headers