Support for export/import into encrypted ZIP. Added more unit tests