test(wtr): clean up hydration test logic @W-19098266 (#5487)

test(wtr): clean up hydration test logic @W-19098266 (#5487) #394