B58092 increased test coverage of datastore filter and service