Extended moduleImport test to test a module with more than one path component.  This required a change to the includes test, because of the change to the headers.