Fix tests broken by channel write locking change.