Test implementation and minor fix to call-flow-protocol file.