anchor.diff:  
       % Enable auto-failover (when a node is down longer than 5 seconds)
       % Only failover one node
  -    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [5, 1]),
  +    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [50, 1]),
   
       % Stop two nodes
       ok = ns_test_util:stop_node(lists:nth(2, Nodes)),
   
  -    % Now we wait until the auto-failover ticks in
  -    ok = ns_test_util:wait_for_failover(hd(Nodes), 10, 'n_1@127.0.0.1'),
  -
  -    % Increase the number of nodes that might be automatically failovered
  +    % Auto-failover shouldn't tick in within 20 seconds
  +    {error, timeout} =  ns_test_util:wait_for_failover(hd(Nodes), 20,
  +                                                       'n_1@127.0.0.1'),
  +
  +    % Decrease the timeout, so that auto-failover ticks in faster
       % to two
  -    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [5, 2]),
  -
  -    % Stop another node
  -    ok = ns_test_util:stop_node(lists:nth(3, Nodes)),
  -
  -    % Auto-failover should failover this node
  -    ok = ns_test_util:wait_for_failover(hd(Nodes), 10, 'n_2@127.0.0.1').
  +    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [5, 1]),
  +
  +    % Auto-failover should failover this node within 20 seconds (even faster)
  +    ok = ns_test_util:wait_for_failover(hd(Nodes), 20, 'n_1@127.0.0.1').
   
   %% @doc enable auto-failover, but failover a node manually
   auto_failover_enabled_failover_one_node_manually(TestConfig) ->
       {nodes, Nodes} = lists:keyfind(nodes, 1, TestConfig),
   
       % Enable auto-failover (when a node is down longer than 15 seconds)
  -    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [15, 3]),
  +    ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [15, 1]),
   
       % Stop two nodes
       ok = ns_test_util:stop_nodes(lists:sublist(Nodes, 2, 2)),
   
       % Failover one node manually and make sure that the other node wasn't
  -    % failoverd
  +    % failovered
       ok = ns_test_util:failover_node(hd(Nodes), lists:nth(2, Nodes)),
       ok = ns_test_util:wait_for_failover(hd(Nodes), 10, 'n_1@127.0.0.1'),
       [{unhealthy, active}] = ns_test_util:nodes_status(hd(Nodes),
  
positive.code:     ok = rpc:call('n_0@127.0.0.1', auto_failover, enable, [5, 1]),
  
      % And will fallover that node
      ok = ns_test_util:wait_for_failover(hd(Nodes), 10, 'n_1@127.0.0.1').
  
  auto_failover_enabled_master_node_down(TestConfig) ->
      {nodes, Nodes} = lists:keyfind(nodes, 1, TestConfig),
  
negative.code:     ok = ns_test_util:stop_node(lists:nth(2, Nodes)),
  
      % Now we wait until the auto-failover ticks in
      ok = ns_test_util:wait_for_failover(hd(Nodes), 20, 'n_1@127.0.0.1').
  
  auto_failover_disabled_one_node_down(TestConfig) ->
      {nodes, Nodes} = lists:keyfind(nodes, 1, TestConfig),
  