just a simple refactoring
making tests more readable and hiding some exception dispatchers