* Rename test/CmakeLists.txt -> test/CMakeLists.txt * Revert accidentally removed processing of resolve-countries option