diff --git a/libbitdht/src/tests/Makefile b/libbitdht/src/tests/Makefile
index d50c95367..8b7f86fb7 100644
--- a/libbitdht/src/tests/Makefile
+++ b/libbitdht/src/tests/Makefile
@@ -12,12 +12,12 @@ include $(TEST_TOP_DIR)/scripts/config.mk
 # Generic Test Harnesses.
 TESTOBJ  = bdmetric_test.o bdmsgs_test.o bdnode_test.o  bdspace_test.o 
 TESTOBJ  += bdmgr_multitest.o bdnode_multitest1.o bdquery_test.o bdstore_test.o
-TESTOBJ  += bdmidids_test.o bdnode_test2.o bdspace_test2.o 
+TESTOBJ  += bdmidids_test.o bdnode_test2.o bdspace_test2.o udpbitdht_nettest.o
 #TESTOBJ += bencode_test.o bdudp_test.o
 
 TESTS  = bdmetric_test bdmsgs_test bdnode_test  bdspace_test 
 TESTS  += bdmgr_multitest bdnode_multitest1 bdquery_test bdstore_test
-TESTS  += bdmidids_test bdnode_test2 bdspace_test2 
+TESTS  += bdmidids_test bdnode_test2 bdspace_test2 udpbitdht_nettest
 #TESTS  += bencode_test bdudp_test
 
 MANUAL_TESTS = 
@@ -63,7 +63,7 @@ bdudp_test: bdudp_test.o
 	$(CC) $(CFLAGS) -o bdudp_test bdudp_test.o $(LIBS)
 
 udpbitdht_nettest: udpbitdht_nettest.o
-	$(CC) $(CFLAGS) -o udpbitdht_test udpbitdht_test.o $(LIBS)
+	$(CC) $(CFLAGS) -o udpbitdht_nettest udpbitdht_nettest.o $(LIBS)
 
 bencode_test: bencode_test.o
 	$(CC) $(CFLAGS) -o bencode_test bencode_test.o $(LIBS)
diff --git a/libbitdht/src/tests/bdboot.txt b/libbitdht/src/tests/bdboot.txt
new file mode 100644
index 000000000..47be5d7b6
--- /dev/null
+++ b/libbitdht/src/tests/bdboot.txt
@@ -0,0 +1,500 @@
+114.39.54.100 19554
+212.75.231.215 22610
+69.127.30.29 50183
+66.188.114.2 53151
+70.138.183.75 48661
+220.100.1.253 14082
+66.197.244.166 6821
+95.136.150.96 46681
+188.72.225.245 1813
+95.146.231.68 10170
+81.94.83.228 32849
+109.108.232.91 21728
+80.74.56.221 61869
+77.35.146.103 55775
+24.20.146.173 43026
+220.134.194.129 19001
+211.73.186.8 26740
+178.93.231.136 50157
+93.175.235.237 57299
+94.137.207.104 55397
+98.148.246.87 37972
+118.171.93.129 22217
+95.84.220.206 62618
+86.108.76.120 49286
+204.244.136.117 6881
+77.224.70.157 60804
+60.54.20.16 26340
+220.139.135.154 7827
+78.90.4.249 12502
+124.125.189.199 47134
+173.169.9.86 31084
+24.98.100.175 7126
+183.178.235.26 24758
+123.224.242.209 23761
+210.86.0.15 18759
+75.149.206.205 10536
+67.84.219.79 8560
+217.146.88.181 54300
+95.28.12.63 10875
+79.94.35.127 55121
+68.108.252.55 61440
+67.170.35.46 62063
+194.187.103.36 64663
+118.236.29.134 43844
+93.84.7.221 13447
+61.0.91.139 26803
+84.121.162.83 34320
+173.176.223.172 27127
+190.213.185.85 22310
+95.221.210.178 13505
+95.24.209.129 21111
+218.186.196.16 6881
+68.49.119.198 30105
+81.159.253.28 15000
+24.10.98.94 13059
+80.216.104.121 61510
+59.113.173.166 22856
+24.15.116.80 32204
+109.194.45.170 29912
+98.247.151.248 55687
+189.4.255.139 9146
+98.66.242.148 50625
+66.157.166.106 20047
+110.136.163.246 25069
+109.161.78.135 8137
+203.186.242.222 26032
+212.34.119.226 35691
+207.6.49.138 6969
+86.123.18.246 22086
+89.42.241.172 46164
+24.34.126.186 59769
+91.124.248.113 10225
+218.21.189.108 20429
+93.96.52.81 47122
+115.72.196.228 6800
+89.201.230.7 14088
+86.215.201.103 29514
+201.255.87.156 51911
+79.116.171.109 19234
+82.154.171.183 48173
+88.115.102.176 59293
+93.84.155.137 10595
+219.35.252.10 55555
+113.21.55.243 19667
+95.25.130.58 20852
+89.137.255.14 12902
+85.175.232.139 44380
+109.87.212.222 28223
+69.136.195.185 11309
+178.59.125.193 56063
+91.182.188.108 31652
+82.170.25.112 51413
+142.68.202.253 55180
+218.111.132.5 15692
+86.127.55.234 20334
+74.235.33.51 50386
+82.117.173.32 13650
+71.198.37.142 15074
+95.168.62.171 25150
+111.240.222.249 62864
+87.2.128.179 63991
+62.42.58.91 1042
+122.177.218.73 10077
+91.148.152.134 24340
+72.39.15.159 60345
+84.24.237.169 59921
+213.91.244.173 55555
+121.134.79.153 42014
+99.63.38.61 63517
+86.7.25.152 60091
+85.210.23.49 49872
+89.230.131.253 15436
+78.8.127.175 48223
+78.178.71.110 46537
+118.171.194.81 8345
+85.89.186.67 51413
+93.103.152.232 22078
+76.112.249.61 53669
+85.58.216.88 43948
+82.137.79.155 15408
+125.231.225.33 11981
+112.201.53.14 18868
+207.118.142.210 50813
+220.136.178.235 25977
+78.25.181.98 34880
+89.122.128.252 21459
+82.38.64.66 16953
+82.247.189.194 63478
+85.121.214.176 31281
+62.192.242.154 59464
+98.219.221.234 22770
+124.144.233.178 9335
+85.187.239.176 54709
+178.44.218.32 17214
+109.195.131.45 18169
+80.212.49.109 54868
+99.96.13.11 64030
+190.192.220.145 56656
+190.179.202.60 10262
+110.174.10.181 21799
+82.27.51.70 18073
+99.227.10.5 16662
+196.218.38.146 10055
+206.248.108.5 18130
+87.17.159.228 16215
+76.95.11.16 64463
+86.150.249.181 6881
+115.240.28.226 49148
+76.119.206.114 6881
+89.75.52.83 34055
+78.106.87.78 28988
+74.250.134.46 57848
+95.91.36.34 51413
+213.114.101.46 11620
+75.51.75.216 59972
+68.4.67.238 44832
+84.52.38.204 53065
+142.68.230.32 60968
+96.50.131.133 31684
+180.68.18.184 63792
+91.203.189.100 61391
+123.202.206.64 6881
+82.46.178.191 16363
+81.166.136.228 58006
+188.52.47.54 12698
+118.237.142.69 52729
+201.19.86.9 61355
+113.53.45.135 55555
+121.7.27.67 18758
+89.184.145.241 9009
+213.214.67.34 16800
+93.95.92.35 17248
+203.218.113.128 9462
+95.153.164.4 40023
+109.108.235.75 58371
+123.91.21.58 25076
+95.79.107.69 15354
+85.227.214.101 36351
+83.5.98.228 15091
+111.235.24.67 16934
+84.222.194.71 50190
+221.130.163.200 8905
+92.112.14.249 22745
+84.240.44.175 18416
+174.96.42.63 44013
+98.228.50.5 63440
+115.177.173.204 22786
+123.202.51.220 16001
+118.165.9.141 18751
+61.58.191.140 14490
+83.254.64.144 47994
+89.136.20.253 16522
+99.159.250.32 22656
+187.64.218.242 62685
+89.241.158.147 22998
+84.108.246.142 41947
+98.198.130.145 12954
+93.164.251.146 6883
+77.123.7.165 35691
+85.216.221.115 7232
+189.120.213.124 65465
+175.128.83.60 62216
+175.137.196.28 17342
+85.68.166.6 32167
+80.202.94.20 36945
+94.232.135.97 36031
+77.37.139.99 26973
+81.24.210.253 34483
+212.174.9.10 64969
+96.228.35.250 64059
+98.155.80.108 28265
+82.55.167.127 40581
+141.152.181.4 50012
+92.249.191.37 29347
+24.64.106.176 61579
+89.47.57.117 9054
+114.24.195.51 12066
+110.137.81.98 26201
+188.165.215.148 35775
+78.60.67.126 51134
+188.18.57.55 8447
+121.106.156.218 54444
+124.82.121.128 9795
+76.232.119.73 61243
+83.103.197.225 18706
+88.178.52.25 20468
+88.226.204.1 33434
+114.161.143.54 57930
+115.135.90.242 12279
+78.63.28.212 39398
+188.18.81.154 35691
+193.26.13.73 61527
+116.113.223.63 16068
+212.187.7.68 41823
+66.203.164.20 16210
+79.9.28.109 10254
+112.205.90.145 27962
+187.91.43.234 57803
+109.108.39.178 9000
+95.156.120.77 15619
+124.104.204.201 50524
+122.100.177.233 6889
+95.104.83.111 12834
+99.92.88.171 56058
+112.104.114.13 11403
+79.100.168.120 19561
+78.251.234.239 59735
+77.94.112.102 63431
+68.103.186.81 42197
+24.138.37.4 13731
+60.52.90.192 55636
+83.21.162.109 43604
+95.220.45.221 13078
+61.91.88.16 16880
+78.147.56.155 20648
+114.27.159.37 23908
+86.192.44.125 16157
+98.176.70.110 61064
+41.213.178.126 55764
+86.211.238.186 17824
+89.215.227.16 62105
+94.211.63.116 28779
+95.65.17.160 19311
+94.76.96.226 10611
+212.21.16.76 20408
+76.93.66.53 62327
+81.200.156.184 54547
+80.177.165.168 33754
+69.141.124.24 6799
+212.36.247.230 35691
+200.68.106.148 54251
+141.152.181.4 50918
+119.202.26.40 49386
+95.76.64.20 16346
+83.226.36.50 49999
+71.59.190.63 58638
+83.115.101.72 37548
+98.156.123.148 19802
+69.231.131.149 45006
+78.133.47.148 27896
+88.192.73.144 6881
+74.129.247.212 24829
+88.252.22.216 60670
+58.90.242.71 27384
+160.114.83.2 6688
+118.111.156.226 20508
+111.248.11.238 24604
+86.68.57.167 22151
+76.102.234.104 36310
+124.189.161.94 22414
+58.3.175.243 24796
+112.119.194.44 12712
+94.76.96.95 17117
+24.251.17.180 22938
+222.130.217.206 9044
+203.223.236.141 16001
+188.186.72.203 56340
+203.212.2.152 8982
+112.118.137.166 19859
+193.151.57.169 6881
+174.116.90.192 26802
+89.252.126.108 53004
+77.109.214.112 45948
+178.175.19.112 34868
+120.203.87.67 14023
+91.180.157.2 37962
+94.242.45.152 18240
+92.83.137.232 57066
+24.22.209.82 6882
+114.176.153.241 45881
+202.231.187.234 20646
+88.216.54.253 21972
+95.131.209.139 34023
+81.195.84.6 57264
+87.68.85.133 37039
+108.7.97.26 39276
+93.86.172.207 10041
+208.127.132.128 6881
+212.113.33.131 60003
+190.162.70.21 20999
+95.105.208.130 56202
+87.205.166.98 24856
+108.6.47.164 58590
+96.20.74.14 55672
+121.160.139.9 19617
+203.136.93.97 51990
+116.14.24.5 39662
+76.111.181.68 18631
+84.209.70.180 63869
+78.87.103.116 58478
+99.239.201.60 6881
+78.146.229.96 14375
+112.201.169.5 1392
+109.96.18.50 10030
+84.111.100.139 46217
+115.96.138.3 1221
+187.59.192.235 63108
+88.179.18.142 52750
+78.227.124.217 53330
+71.233.192.92 6881
+92.248.145.10 55997
+67.215.242.139 6881
+99.67.21.185 49519
+114.47.230.206 15652
+79.165.120.179 15864
+94.236.134.60 1091
+188.102.204.146 4002
+74.100.62.203 44664
+89.142.91.205 30386
+109.192.197.172 63998
+96.48.192.134 60551
+95.59.112.215 13582
+220.137.145.200 12850
+115.43.166.132 20420
+89.149.227.130 54467
+89.41.37.185 28013
+89.230.141.151 21513
+109.211.178.182 22698
+67.215.242.138 6881
+92.124.165.75 17048
+114.75.147.245 7240
+114.162.73.133 49152
+202.89.175.193 53376
+60.34.221.40 10951
+109.182.60.132 47452
+69.156.165.233 9094
+193.238.17.174 22261
+137.186.174.20 39467
+143.248.80.185 59366
+195.91.229.83 14505
+90.197.51.122 50637
+59.115.152.183 33551
+65.48.211.12 26153
+75.181.72.53 20364
+209.40.182.139 45227
+69.140.119.105 58919
+94.179.212.27 30333
+94.2.0.107 16939
+84.197.209.196 33124
+90.217.72.188 45412
+90.54.159.118 59967
+88.219.249.196 20205
+222.20.71.219 16001
+72.175.73.30 7319
+90.210.142.155 10422
+86.200.169.78 12883
+122.173.245.223 13962
+119.224.11.41 26665
+24.209.191.94 25586
+58.69.89.206 63561
+27.33.41.87 8639
+81.233.26.219 15364
+59.148.147.13 44455
+95.65.79.139 39249
+67.184.37.251 40737
+81.164.195.168 12540
+213.167.211.172 26007
+82.246.39.59 21556
+86.35.151.68 11288
+125.143.143.196 65111
+123.217.244.89 32800
+24.72.127.230 34591
+114.203.194.211 53395
+89.75.57.36 36247
+83.24.23.151 46539
+114.159.93.185 54510
+76.213.155.173 43698
+123.226.191.13 8736
+112.203.3.154 10590
+89.134.188.245 18599
+98.238.120.234 62122
+66.158.178.121 28442
+87.206.65.37 44475
+84.46.164.73 41271
+183.89.116.230 22205
+85.229.37.211 60855
+89.78.21.208 59245
+24.89.199.99 57494
+98.239.180.156 25261
+82.245.238.156 39545
+85.66.2.212 52302
+207.118.142.210 50835
+122.178.181.12 21442
+95.25.72.65 17269
+90.203.16.81 25500
+69.254.11.60 36804
+71.67.122.116 41952
+98.225.40.208 17490
+122.118.183.195 28001
+125.224.162.118 15101
+62.68.165.208 31711
+68.229.58.24 62067
+125.230.43.127 12149
+82.76.196.53 40261
+62.42.32.46 38077
+66.203.194.117 60010
+142.162.18.65 62980
+85.140.16.61 12073
+180.197.98.20 9784
+85.243.248.245 50666
+82.230.144.1 22666
+85.226.189.216 28265
+80.240.210.17 10222
+90.29.197.128 51353
+76.108.40.67 61682
+70.72.59.37 25660
+211.76.172.111 6888
+98.17.168.53 23527
+123.110.215.145 10630
+84.26.218.9 32793
+79.165.165.155 21639
+93.190.202.49 35770
+68.196.92.231 9641
+178.49.38.208 30259
+82.56.117.63 7147
+195.208.11.214 62437
+124.26.65.15 13274
+118.12.229.246 7750
+98.92.196.112 50672
+109.91.162.68 41454
+109.66.184.96 28769
+174.98.152.253 53363
+217.76.187.121 45486
+77.121.81.130 37339
+58.188.21.105 23630
+71.74.98.133 46791
+190.142.105.159 57687
+82.132.104.150 28511
+68.255.6.217 62211
+93.116.48.180 47676
+75.180.47.47 28483
+116.88.199.8 10231
+115.176.131.150 8030
+94.21.137.106 1056
+84.247.48.43 17566
+84.40.98.86 15947
+76.24.137.148 23773
+77.70.29.89 51379
+173.23.157.97 16994
+212.17.86.122 32012
+95.239.66.249 17033
+62.107.109.171 16832
+79.164.44.100 10453
+99.253.38.74 19441
+78.84.48.149 8694
+114.43.201.50 9426
+217.25.241.138 19518
+203.158.60.12 25723
+122.161.158.237 15903
+80.235.136.233 17866
+59.148.110.152 7022
+202.225.19.72 23157
+124.11.148.31 4322
+78.60.241.230 23161
+68.13.158.198 45437
+83.251.65.144 59604
+99.69.141.24 23579
+24.109.229.78 40666
+76.225.138.22 56814
+142.59.53.126 54853
diff --git a/libbitdht/src/udp/udpbitdht_nettest.cc b/libbitdht/src/tests/udpbitdht_nettest.cc
similarity index 97%
rename from libbitdht/src/udp/udpbitdht_nettest.cc
rename to libbitdht/src/tests/udpbitdht_nettest.cc
index b7de0cbad..d1311bc8a 100644
--- a/libbitdht/src/udp/udpbitdht_nettest.cc
+++ b/libbitdht/src/tests/udpbitdht_nettest.cc
@@ -24,9 +24,9 @@
  */
 
 
-#include "udpbitdht.h"
-#include "udpstack.h"
-#include "bdstddht.h"
+#include "udp/udpbitdht.h"
+#include "udp/udpstack.h"
+#include "bitdht/bdstddht.h"
 
 #include <string.h>
 #include <stdlib.h>