WIP add treated_exceptions support
Fix little things, waiting for a valid testing environment.