More tests for protocol revamp