Extennd on Zone tests
Add image unittests