Fix tests after state var name change.

Submitting ric's change.