Fix for test not correctly using ExceptionHandler