Fix tests more.