Release 2108 Improved CPI Testing IRT / By Daniel Release 2108. Better error handling for CPI testing