Revert severity calculation, base severity on outer exception only.
Fix unit tests on Windows