Convert added tree tests to use dstore