Commented out yet untested code
Fixed thrown exceptions

The integration test run now, again, even they are far from passing:

Tests: 469, Assertions: 362, Failures: 120, Errors: 75, Incomplete: 46, Skipped: 1003.