anchor.diff:                  end,
               {LNode, LName, Result}
           end, Listeners),
  -
  -    ListenersByNode = lists:foldl(
  -        fun({LNode, LName, Status}, Proplist) ->
  -            NewListenerList = [{LName, Status} | proplists:get_value(LNode, Proplist, [])],
  -            [{LNode, NewListenerList} | proplists:delete(LNode, Proplist)]
  -        end, [], ListenerStatuses),
  +    arrange_by_node(Nodes, ListenerStatuses).
  +
  +
  +%%--------------------------------------------------------------------
  +%% @doc
  +%% Arranges given items (workers, listeners) by node and includes empty nodes.
  +%% @end
  +%%--------------------------------------------------------------------
  +-spec arrange_by_node(Nodes :: [atom()], ItemStatuses) ->
  +    [{Node :: atom(), [{Listener :: atom(), Status :: healthcheck_response()}]}] when
  +    ItemStatuses :: {INode :: node(), IName :: atom(), Result :: healthcheck_response()}.
  +arrange_by_node(Nodes, ItemStatuses) ->
  +    ItemsByNode = lists:foldl(
  +        fun({INode, IName, Status}, Proplist) ->
  +            NewItemList = [{IName, Status} | proplists:get_value(INode, Proplist, [])],
  +            [{INode, NewItemList} | proplists:delete(INode, Proplist)]
  +        end, [], ItemStatuses),
   
       % If a has no listeners, it won't be on the ListenersByNode list, so lets add it.
       EmptyNodes = lists:foldl(
           fun(Node, Acc) ->
  -            case proplists:get_value(Node, ListenersByNode) of
  +            case proplists:get_value(Node, ItemsByNode) of
                   undefined -> [{Node, []} | Acc];
                   _ -> Acc
               end
           end, [], Nodes),
  -    ListenersByNode ++ EmptyNodes.+    ItemsByNode ++ EmptyNodes.
positive.code:                         NodeDetails = lists:map(
                              fun({Component, Status}) ->
                                  StatusList = case Status of
                                                   {error, Desc} -> "error: " ++ atom_to_list(Desc);
                                                   _ -> atom_to_list(Status)
                                               end,
                                  {Component, [{status, StatusList}], []}
  
negative.code:                 end,
              {WNode, WName, Result}
          end, Workers),
      arrange_by_node(Nodes, WorkerStatuses).
  
  
  %%--------------------------------------------------------------------
  