Additional PR tweaks, add new PROTOCOL_TYPES and associated test