ZFileTest fixes and improvements am: 303c8ab014
am: 9b0e81f876

Change-Id: I316bb5f20f6754e392e83e4ca215fabe9e9c1a23