Code clean up for Test Cases for refactored Protocol to now handle
exceptions for error handling