Rename countries-test to cities-test.