Fixed incorrect test and added some more tests to ZFileTest. Test: This is what this CL is all about Change-Id: I4dbc87580fab059f810344e1f86673e0b49c04d6
mentioned in commit 4c5f3776