Tweak to protocol tests to aid backporting