Fix tests too.