Fix tests again.