Fix tests finally.