anchor.diff:                   %% Would really like this in a nested {setup, blah} structure
                    %% but eunit does not allow
                    pause_riak_pb_listener(),
  -                 {ok, Pid} = start_link(?TEST_IP, ?TEST_PORT),
  +                 {ok, Pid} = start_link(?TEST_IP, ?TEST_PORT, [queue_if_disconnected]),
                    Me = self(),
                    %% this request will block as
                    spawn(fun() -> Me ! {1, ping(Pid, 0)} end),
  
positive.code: init([Address, Port, Options]) ->
      %% Schedule a reconnect as the first action.  If the server is up then 
      %% the handle_info(reconnect) will run before any requests can be sent.
      self() ! reconnect,
      {ok,  parse_options(Options, #state{address = Address, 
                                          port = Port,
                                          queue = queue:new()})}.
  
  %% @private
  handle_call({req, Msg, Timeout}, From, State) when State#state.sock =:= undefined ->
      case State#state.queue_if_disconnected of
  
negative.code:     end.
  
  %% @private
  %% Connect the socket if disconnected
  connect(State) when State#state.sock =:= undefined ->
      #state{address = Address, port = Port, connects = Connects} = State,
      case gen_tcp:connect(Address, Port,
                           [binary, {active, once}, {packet, 4}, {header, 1}]) of
          {ok, Sock} ->
              {ok, State#state{sock = Sock, connects = Connects+1, 
                               reconnect_interval = ?FIRST_RECONNECT_INTERVAL}};
          Error ->
              Error
      end.
  
  %% @private
  %% Disconnect socket if connected
  disconnect(State) ->
      %% Tell any pending requests we've disconnected
      case State#state.active of
          undefined ->
  