Refactor DataStore specs