Fix tests also