Fix tests against latest.