Release 2108 Improved CPI Testing

Release 2108. Better error handling for CPI testing