Tests and tidy up for the zonetrees code am: 0d8c2e75de
am: 42f600dd39

Change-Id: I8ecf04b16473f3172615c21367534a2dd21eac5e