Merge "Remove unused TestProtocol" into main