Finish converting manual tests to dstore