Updated ReadWrite zip file support and related unit tests