Test cleanup
Dictionary extended
IDEA-103576 (correct processing of unhandled multi-catch exceptions)