modified two datasource related tests to create compliant accessor functions