More bug fixes and some extra testing on data_store.