Issue #163: Convert test variables to the state system.