Refactoring the tests and the behavior to not use the blackhole exception anymore