bring back errback, adjusted protocol tests for unified