fixing unit tests
Merge remote-tracking branch 'github/update-dc-client-wip' into update-dc-client-wip