Fixing some tests, also adding <city>xx</city> to tell  unknown cities  from others, as requested by Greg Refs #1652

git-svn-id: http://dev.piwik.org/svn/trunk@7498 59fd770c-687e-43c8-a1e3-f5a4ff64c105