Add zone db & update tests.