Fix tests for ee7fe9c4b30606254dd5d61743b63414ca6aaff3
Correct test for fffc2dd21bb5dcdd230e9bc15aa6b0c283d88f53
More fixes for binding stacktrace to exception