Fix IB addOn tests

Fix IB addOn tests from #5530 fallout.