Merge "[DataStore] Add more test cases" into main