Refactor of exception handling specs