How to deploy a site from development to test

I've developed a SharePoint 2010 site on a development server and now need to deploy it to a test server

As the site has SharePoint publishing enabled, I've used Powershell to export the site (Export-SPWeb) and a series of further commands to create a content database, a team site with my site's name and to enable SharePoint publishing on it

I've then used Import-SPWeb to import my site to the newly created site

(The site contains 3 web part pages with content query web parts that query the site's 5 lists)

All is fine except that the CQWPs are not returing data - this appears to be because the CQWP references the list via its GUID and not it's name

Is there any way around this? - or a better deployment method

Any suggestions would be useful

Thanks