Improved tests.
Added Zone model, repository and tests