Merge "Cleaning up TestProtocol" into main