Adds Zend connector exception test
Cleans connectors
Updates TODO