Fix issues with hierarchical test stores
Fix tree-expand-promise tests for dstore