Created zonal operations using new DataSource methods.
Modifications to unit tests.