tests updates
test updates
Fixed Zonal tests