unittests: fixed include
zone-events: Whitespace removed
zone-events: renamed files