* Fix warning in test/CMakeLists.txt * Fix router name check in test_upnp
* Rename test/CmakeLists.txt -> test/CMakeLists.txt * Revert accidentally removed processing of resolve-countries option