anchor.diff:       {download_dir, DataDir},
        {logger_dir, PrivDir},
        {logger_fname, "seed_etorrent.log"},
  -     {fast_resume_file, filename:join([PrivDir, "seed_fast_resume"])} | CConf].
  -
  -leech_configuration(CConf, PrivDir) ->
  -    leech_configuration(CConf, PrivDir, "nothing-et").
  -
  -leech_configuration(CConf, PrivDir, DownloadSuffix) ->
  +     {fast_resume_file, ?config(seed_fast_resume, Config)} | CConf].
  +
  +leech_configuration(Config, CConf, PrivDir) ->
  +    leech_configuration(CConf, PrivDir, ?ET_WORK_DIR).
  +
  +leech_configuration(Config, CConf, PrivDir, DownloadSuffix) ->
       [{port, 1769 },
        {udp_port, 1760 },
        {dht_state, filename:join([PrivDir, "leecher_state.persistent"])},
  
positive.code: 
  spawn_leecher(Config) ->
      CommonConf = ct:get_config(common_conf),
      LeechConfig = leech_configuration(CommonConf,
  				      ?config(priv_dir, Config),
  				      ?ETORRENT_WORK_DIR),
      ok = rpc:call(?config(leech_node, Config), etorrent, start_app, [LeechConfig]).
  
  spawn_seeder(Config) ->
      CommonConf = ct:get_config(common_conf),
      SeedConfig = seed_configuration(CommonConf,
  				    ?config(priv_dir, Config),
  				    ?config(data_dir, Config)),
      ok = rpc:call(?config(seed_node, Config), etorrent, start_app, [SeedConfig]).
  
negative.code:     test_server:stop_node(LN),
      ok.
  
  end_locations(Config) ->
      DataDir = ?config(data_dir, Config),
      PrivDir = ?config(priv_dir, Config),
  
      %% Remove locations
      ok = file:del_dir(filename:join([PrivDir, ?ET_WORK_DIR])),
  
      ok = file:delete(filename:join([PrivDir, ?TR_WORK_DIR, "settings.json"])),
      ok = file:del_dir(filename:join([PrivDir, ?TR_WORK_DIR])).
  
  
  init_locations(Config) ->
      %% Setup locations that some of the test cases use
      DataDir = ?config(data_dir, Config),
      PrivDir = ?config(priv_dir, Config),
  
      %% Create locations
      file:make_dir(filename:join([PrivDir, ?ET_WORK_DIR])),
      file:make_dir(filename:join([PrivDir, ?TR_WORK_DIR])),
  
      %% Setup common locations
      SeedTorrent = filename:join([DataDir, ?TESTFILE30M ++ ".torrent"]),
      SeedFile    = filename:join([DataDir, ?TESTFILE30M]),
      SeedFastResume = filename:join([PrivDir, "seed_fast_resume"]),
  
      LeechFile    = filename:join([PrivDir, ?TESTFILE30M]),
      LeechFastResume = filename:join([PrivDir, "leech_fast_resume"]),
  
      %% Setup Etorrent location
      EtorrentWorkDir          = filename:join([PrivDir, ?ET_WORK_DIR]),
      EtorrentLeechFile        = filename:join([PrivDir, ?ET_WORK_DIR, ?TESTFILE30M]),
  
      %% Setup Transmission locations
      TransMissionWorkDir      = filename:join([PrivDir, ?TR_WORK_DIR]),
      TransMissionFile     = filename:join([PrivDir, ?TR_WORK_DIR, ?TESTFILE30M]),
      {ok, _} = file:copy(filename:join([DataDir, "transmission", "settings.json"]),
  			filename:join([TransMissionWorkDir, "settings.json"])),
  
      [{seed_torrent, SeedTorrent},
       {seed_file,    SeedFile},
       {seed_fast_resume, SeedFastResume},
       {leech_file,    LeechFile},
       {leech_fast_resume, LeechFastResume},
       {et_work_dir, EtorrentWorkDir},
       {et_leech_file, EtorrentLeechFile},
       {tr_work_dir, TransMissionWorkDir},
  