anchor.diff:      end.
   
   chk_empty_con_daemon(Daemon) ->
  -    ?wait_match([{_,SubSysSup, supervisor,[ssh_subsystem_sup]},
  -		 {{ssh_acceptor_sup,_}, AccSup, supervisor,[ssh_acceptor_sup]}],
  +    ?wait_match([?SUB_SYSTEM_SUP(SubSysSup),
  +		 ?ACCEPTOR_SUP(AccSup,_)
  +                ],
   		supervisor:which_children(Daemon),
                   [SubSysSup,AccSup]),
  -    ?wait_match([{connection,ServerConnPid,worker,[ssh_connection_handler]},
  -                 {_,FwdAccSup, supervisor,[ssh_tcpip_forward_acceptor_sup]},
  -                 {_,ChSup,supervisor,[ssh_channel_sup]}
  +    ?wait_match([{_,FwdAccSup, supervisor,[ssh_tcpip_forward_acceptor_sup]},
  +                 {_,ChSup,supervisor,[ssh_channel_sup]},
  +                 {connection,ServerConnPid,worker,[ssh_connection_handler]}                 
                   ],
   		supervisor:which_children(SubSysSup),
   		[ChSup,FwdAccSup,ServerConnPid]),
       ?wait_match([], supervisor:which_children(FwdAccSup)),
       ?wait_match([], supervisor:which_children(ChSup)),
  -    ?wait_match([{{ssh_acceptor_sup,_},_,worker,[ssh_acceptor]}],
  +    ?wait_match([?ACCEPTOR_WORKER(_,_)],
                   supervisor:which_children(AccSup),
                   []),
       [SubSysSup, ChSup, ServerConnPid, AccSup, FwdAccSup].
  
positive.code: 
      ct:pal("Expect a SUPERVISOR REPORT with offender {pid,~p}....~n", [ChPid2]),
      exit(ChPid2, kill),
      ?wait_match([{connection,Connection,worker,[ssh_connection_handler]},
                   {_,FwdAccSup, supervisor,[ssh_tcpip_forward_acceptor_sup]},
                   {_,ChSup,supervisor, [ssh_channel_sup]}
                  ],
  		supervisor:which_children(SubSysSup),
  		[ChSup,FwdAccSup]),
  
negative.code: 
  -define(WAIT_FOR_SHUTDOWN, 500).
  
  -define(SSHC_SUP(Pid), {sshc_sup, Pid, supervisor, [supervisor]}).
  -define(SSHD_SUP(Pid), {sshd_sup, Pid, supervisor, [supervisor]}).
  -define(SYSTEM_SUP(Pid,Address), {{ssh_system_sup, Address}, Pid, supervisor,[ssh_system_sup]}).
  -define(SUB_SYSTEM_SUP(Pid), {_,Pid, supervisor,[ssh_subsystem_sup]}).
  -define(ACCEPTOR_SUP(Pid,Address), {{ssh_acceptor_sup,Address},Pid,supervisor,[ssh_acceptor_sup]}).
  -define(ACCEPTOR_WORKER(Pid,Address), {{ssh_acceptor_sup,Address},Pid,worker,[ssh_acceptor]}).
  
  %%--------------------------------------------------------------------
  %% Common Test interface functions -----------------------------------
  