Fix some tests broken by recent definitions change.