Add support for broken protocol tests (backport from master branch)