Tests adjustments for new exception arrangement part 2