Removed dependency on Directory class from ZipTest class