add more test scenarios for data rehydration