Add error handling DSL
Improve readability of tests