I would go with your second option: create a new XML file during 'make' or 'make test' in the proper direcotry for testing, then copy the XML file to the proper location for installation. Production modules should not have to worry about the test harness. Removing ambiguity in the search path may also reduce headaches later on.