Fix tests + build warning