anchor.diff:      ok = inets:start(permanent),
       ok = inets:stop().
   
  -
  -%%-------------------------------------------------------------------------
  -
  -start_httpc(doc) ->
  -    ["Start/stop of httpc service"];
  -start_httpc(suite) ->
  -    [];
  +%%-------------------------------------------------------------------------
  +
  +start_httpc() ->
  +    [{doc, "Start/stop of httpc service"}].
   start_httpc(Config) when is_list(Config) ->
       process_flag(trap_exit, true),
  -    tsp("start_httpc -> entry with"
  -	"~n   Config: ~p", [Config]),
  -
       PrivDir = ?config(priv_dir, Config),
   
  -    tsp("start_httpc -> start (empty) inets"),
  -    ok = inets:start(),
  -
  -    tsp("start_httpc -> start httpc (as inets service) with profile foo"),
  +    ok = inets:start(),
       {ok, Pid0} = inets:start(httpc, [{profile, foo}]),
   
  -    tsp("start_httpc -> check running services"),
       Pids0 =  [ServicePid || {_, ServicePid} <- inets:services()],  
       true = lists:member(Pid0, Pids0),
       [_|_] = inets:services_info(),	
   
  -    tsp("start_httpc -> stop httpc"),
       inets:stop(httpc, Pid0),
   
  -    tsp("start_httpc -> sleep some"),
       test_server:sleep(100),
   
  -    tsp("start_httpc -> check running services"),
       Pids1 =  [ServicePid || {_, ServicePid} <- inets:services()], 
       false = lists:member(Pid0, Pids1),        
   
  -    tsp("start_httpc -> start httpc (stand-alone) with profile bar"),
       {ok, Pid1} = inets:start(httpc, [{profile, bar}], stand_alone),
   
  -    tsp("start_httpc -> check running services"),
       Pids2 =  [ServicePid || {_, ServicePid} <- inets:services()], 
       false = lists:member(Pid1, Pids2),   
   
  -    tsp("start_httpc -> stop httpc"),
       ok = inets:stop(stand_alone, Pid1),
       receive 
   	{'EXIT', Pid1, shutdown} ->
   	    ok
       after 100 ->
  -	    tsf(stand_alone_not_shutdown)
  +	    ct:fail(stand_alone_not_shutdown)
       end,
   
  -    tsp("start_httpc -> stop inets"),
  -    ok = inets:stop(),
  -
  -    tsp("start_httpc -> unload inets"),
  -    application:load(inets),
  -
  -    tsp("start_httpc -> set inets environment (httpc profile foo)"),
  +    ok = inets:stop(),
  +
  +    application:load(inets),
       application:set_env(inets, services, [{httpc,[{profile, foo}, 
   						  {data_dir, PrivDir}]}]),
  -
  -    tsp("start_httpc -> start inets"),
  -    ok = inets:start(),
  -
  -    tsp("start_httpc -> check running services"),
  +    ok = inets:start(),
  +
       (?NUM_DEFAULT_SERVICES + 1) = length(inets:services()),
   
  -    tsp("start_httpc -> unset inets env"),
  -    application:unset_env(inets, services),
  -
  -    tsp("start_httpc -> stop inets"),
  -    ok = inets:stop(),
  -
  -    tsp("start_httpc -> start (empty) inets"),
  -    ok = inets:start(),
  -
  -    tsp("start_httpc -> start inets httpc service with profile foo"),
  +    application:unset_env(inets, services),
  +    ok = inets:stop(),
  +    ok = inets:start(),
  +
       {ok, Pid3} = inets:start(httpc, [{profile, foo}]),
  -
  -    tsp("start_httpc -> stop inets service httpc with profile foo"),
       ok = inets:stop(httpc, foo),
  -
  -    tsp("start_httpc -> check running services"),
       Pids3 =  [ServicePid || {_, ServicePid} <- inets:services()], 
       false = lists:member(Pid3, Pids3),      
  -
  -    tsp("start_httpc -> stop inets"),
  -    ok = inets:stop(),
  -
  -    tsp("start_httpc -> done"),    
  -    ok.
  -
  -
  -%%-------------------------------------------------------------------------
  -
  -start_httpd(doc) ->
  -    ["Start/stop of httpd service"];
  -start_httpd(suite) ->
  -    [];
  +    ok = inets:stop().
  +
  +%%-------------------------------------------------------------------------
  +
  +start_httpd() ->
  +    [{doc, "Start/stop of httpd service"}].
   start_httpd(Config) when is_list(Config) ->
       process_flag(trap_exit, true),
  -    i("start_httpd -> entry with"
  -      "~n   Config: ~p", [Config]),
       PrivDir = ?config(priv_dir, Config),
       HttpdConf = [{server_name, "httpd_test"}, {server_root, PrivDir},
  -		 {document_root, PrivDir}, {bind_address, "localhost"}],
  -    
  -    i("start_httpd -> start inets"),
  -    ok = inets:start(),
  -
  -    i("start_httpd -> start httpd service"),
  +		 {document_root, PrivDir}, {bind_address, any}],
  +    
  +    ok = inets:start(),
       {ok, Pid0} = inets:start(httpd, [{port, 0}, {ipfamily, inet} | HttpdConf]),
       Pids0 =  [ServicePid || {_, ServicePid} <- inets:services()],  
       true = lists:member(Pid0, Pids0),
       [_|_] = inets:services_info(),	
   
  -    i("start_httpd -> stop httpd service"),
       inets:stop(httpd, Pid0),
       test_server:sleep(500),
       Pids1 =  [ServicePid || {_, ServicePid} <- inets:services()], 
       false = lists:member(Pid0, Pids1),        
  -    i("start_httpd -> start (stand-alone) httpd service"),
       {ok, Pid1} = 
   	inets:start(httpd, [{port, 0}, {ipfamily, inet} | HttpdConf], 
   		    stand_alone),
       Pids2 =  [ServicePid || {_, ServicePid} <- inets:services()], 
       false = lists:member(Pid1, Pids2),   
  -    i("start_httpd -> stop (stand-alone) httpd service"),
       ok = inets:stop(stand_alone, Pid1),
       receive 
   	{'EXIT', Pid1, shutdown} ->
  
positive.code: 			{'EXIT', Pid1, shutdown} ->
  			    ok
  		    after 100 ->
  			    tsf(stand_alone_not_shutdown)
  		    end,
  		    ok = inets:stop(),
  		    ok;
  
negative.code: 			      {document_root, DataDir}, 
  			      {bind_address, "localhost"}], non_disturbing),
      test_server:sleep(5000),    
      [{document_root, DataDir}] =  httpd:info(Pid0, [document_root]),
      test_server:sleep(5000),    
  
      ok = httpd:reload_config([{port, Port0}, {ipfamily, inet},
  			      {server_name, "httpd_test"}, 
  