Added Unit tests with different datasource