Fix test fail after merge kill-exobuild