WIP: Zone tests and other improvements