Fix tests.
Fix after rebase.