Fix before/after exceptions to be reported
Cleanup test
Merge pull request #278 from geek/master

Fix before/after exceptions to be reported