Two more tests effected by DI exception change