Rework data and index loading and saving to make testing easier
Update ds tests