Add more test scenarios for data rehydration

Add more test scenarios for data rehydration