[rebase][arith] Fix four fir-dev lit tests modified by fir-dev cherry-pick

Cherry-picked changed after move to arith needed some more fixes.

Author: jeanPerier