Fixing unittest (how did this break?!)
Removing debug raise
Required change after latest headers, dc, etc. changes