Add failing test for exception handling regression

Code coming out of custom error message needs to be the code expected.
Fix a regression with custom error handling
Tidy up test client a bit
Stay up w/ Algorithm API

stop_after got renamed to return_after