Update logic for ClientStateTest.
Update logic for ClientStateTest.