Tweak to protocol tests to aid backporting
Merge pull request #474 from rorygraves/update_protocol_test

Tweak to protocol tests to aid backporting