WIP manual test conversion for dstore