*** empty log message ***
diff --git a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
index 2c257c7..7f335e2 100644
--- a/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
+++ b/tests/org.eclipse.wst.common.tests.collector/collector/org/eclipse/wst/common/tests/collector/TestCollectorGUI.java
@@ -26,109 +26,110 @@
 
 /**
  * @author jsholl
- *
- * To change this generated comment go to 
- * Window>Preferences>Java>Code Generation>Code and Comments
+ * 
+ * To change this generated comment go to Window>Preferences>Java>Code Generation>Code and Comments
  */
 public class TestCollectorGUI extends Composite implements ModifyListener {
 
-    private TestCollectorInnerPanes innerPanes = null;
-    private Combo combo = null;
+	private TestCollectorInnerPanes innerPanes = null;
+	private Combo combo = null;
 
-    private Hashtable testSuites = new Hashtable();
-    private Hashtable classLoaders = new Hashtable();
+	private Hashtable testSuites = new Hashtable();
+	private Hashtable classLoaders = new Hashtable();
 
-    /**
-     * @param parent
-     * @param style
-     */
-    public TestCollectorGUI(Composite parent, int style) {
-        super(parent, style);
+	/**
+	 * @param parent
+	 * @param style
+	 */
+	public TestCollectorGUI(Composite parent, int style) {
+		super(parent, style);
 
-        loadConfiguration();
+		loadConfiguration();
 
-        createPartControl();
-    }
+		createPartControl();
+	}
 
-    private void loadConfiguration() {
-        TestCollectorPlugin plugin = TestCollectorPlugin.instance;
-        IExtension[] suitesExtensions = plugin.suitesExtensionPoint.getExtensions();
+	private void loadConfiguration() {
+		TestCollectorPlugin plugin = TestCollectorPlugin.instance;
+		IExtension[] suitesExtensions = plugin.suitesExtensionPoint.getExtensions();
 
-        for (int i = 0; i < suitesExtensions.length; i++) {
-            IExtension extension = suitesExtensions[i];
-            IConfigurationElement[] tests = extension.getConfigurationElements();
-            for (int j = 0; j < tests.length; j++) {
-                try {
-                    IConfigurationElement element = tests[j];
-                    String suiteName = element.getAttribute("suiteName");
-                    String suiteClass = element.getAttribute("suiteClass");
-                    testSuites.put(suiteName, suiteClass);
-                    classLoaders.put(suiteName, extension.getDeclaringPluginDescriptor().getPluginClassLoader());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
+		for (int i = 0; i < suitesExtensions.length; i++) {
+			IExtension extension = suitesExtensions[i];
+			IConfigurationElement[] tests = extension.getConfigurationElements();
+			for (int j = 0; j < tests.length; j++) {
+				try {
+					IConfigurationElement element = tests[j];
+					String suiteName = element.getAttribute("name");
+					String suiteClass = element.getAttribute("class");
+					testSuites.put(suiteName, suiteClass);
+					classLoaders.put(suiteName, extension.getDeclaringPluginDescriptor().getPluginClassLoader());
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
 
-    public void createPartControl() {
-        GridLayout gridLayout = new GridLayout();
-        gridLayout.numColumns = 1;
-        setLayout(gridLayout);
+	public void createPartControl() {
+		GridLayout gridLayout = new GridLayout();
+		gridLayout.numColumns = 1;
+		setLayout(gridLayout);
 
-        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-        gridData.horizontalSpan = 1;
+		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+		gridData.horizontalSpan = 1;
 
-        combo = new Combo(this, SWT.READ_ONLY);
-        Enumeration keys = testSuites.keys();
-        ArrayList arrayList = new ArrayList();
-        while (keys.hasMoreElements()) {
-            arrayList.add(keys.nextElement());
-        }
+		combo = new Combo(this, SWT.READ_ONLY);
+		Enumeration keys = testSuites.keys();
+		ArrayList arrayList = new ArrayList();
+		while (keys.hasMoreElements()) {
+			arrayList.add(keys.nextElement());
+		}
 
-        Collections.sort(arrayList, new Comparator() {
-            public int compare(Object o1, Object o2) {
-                return ((String) o1).compareTo(((String) o2));
-            }
-        });
+		Collections.sort(arrayList, new Comparator() {
+			public int compare(Object o1, Object o2) {
+				return ((String) o1).compareTo(((String) o2));
+			}
+		});
 
-        for (int i = 0; i < arrayList.size(); i++) {
-            combo.add((String) arrayList.get(i));
-        }
-        combo.setLayoutData(gridData);
-        combo.addModifyListener(this);
-        if (combo.getItemCount() > 0) {
-            combo.select(0);
-        }
-    }
+		for (int i = 0; i < arrayList.size(); i++) {
+			combo.add((String) arrayList.get(i));
+		}
+		combo.setLayoutData(gridData);
+		combo.addModifyListener(this);
+		if (combo.getItemCount() > 0) {
+			combo.select(0);
+		}
+	}
 
-    /* (non-Javadoc)
-     * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-     */
-    public void modifyText(ModifyEvent e) {
-        if (e.getSource() == combo) {
-            updateCombo(e);
-        }
-    }
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
+	 */
+	public void modifyText(ModifyEvent e) {
+		if (e.getSource() == combo) {
+			updateCombo(e);
+		}
+	}
 
-    private void updateCombo(ModifyEvent e) {
-        if (null != innerPanes) {
-            innerPanes.dispose();
-        }
-        try {
-            String className = (String) testSuites.get(combo.getText());
-            ClassLoader classLoader = (ClassLoader) classLoaders.get(combo.getText());
-            TestSuite suite = (TestSuite) classLoader.loadClass(className).newInstance();
+	private void updateCombo(ModifyEvent e) {
+		if (null != innerPanes) {
+			innerPanes.dispose();
+		}
+		try {
+			String className = (String) testSuites.get(combo.getText());
+			ClassLoader classLoader = (ClassLoader) classLoaders.get(combo.getText());
+			TestSuite suite = (TestSuite) classLoader.loadClass(className).newInstance();
 
-            innerPanes = new TestCollectorInnerPanes(this, SWT.NULL, new SuiteHelper(suite));
+			innerPanes = new TestCollectorInnerPanes(this, SWT.NULL, new SuiteHelper(suite));
 
-            GridData gridData = new GridData(GridData.FILL_BOTH);
-            gridData.horizontalSpan = 1;
-            innerPanes.setLayoutData(gridData);
-            layout();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
+			GridData gridData = new GridData(GridData.FILL_BOTH);
+			gridData.horizontalSpan = 1;
+			innerPanes.setLayoutData(gridData);
+			layout();
+		} catch (Exception ex) {
+			ex.printStackTrace();
+		}
+	}
 
 }
diff --git a/tests/org.eclipse.wst.common.tests.collector/plugin.xml b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
index bbf7c81..5bdd771 100644
--- a/tests/org.eclipse.wst.common.tests.collector/plugin.xml
+++ b/tests/org.eclipse.wst.common.tests.collector/plugin.xml
@@ -19,9 +19,9 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
    </requires>
+   <extension-point id="suites" name="suites" schema="schema/suites.exsd"/>
 
 
-   <extension-point id="suites" name="suites"/>
 
    <extension
          point="org.eclipse.ui.actionSets">
diff --git a/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd b/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
new file mode 100644
index 0000000..dfec3c5
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.collector/schema/suites.exsd
@@ -0,0 +1,109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.wst.common.tests.collector">
+<annotation>
+      <appInfo>
+         <meta.schema plugin="org.eclipse.wst.common.tests.collector" id="suites" name="suites"/>
+      </appInfo>
+      <documentation>
+         [Enter description of this extension point.]
+      </documentation>
+   </annotation>
+
+   <element name="extension">
+      <complexType>
+         <sequence>
+            <element ref="suite"/>
+         </sequence>
+         <attribute name="point" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="id" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+               <appInfo>
+                  <meta.attribute translatable="true"/>
+               </appInfo>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <element name="suite">
+      <complexType>
+         <attribute name="class" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+         <attribute name="name" type="string" use="required">
+            <annotation>
+               <documentation>
+                  
+               </documentation>
+            </annotation>
+         </attribute>
+      </complexType>
+   </element>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="since"/>
+      </appInfo>
+      <documentation>
+         [Enter the first release in which this extension point appears.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="examples"/>
+      </appInfo>
+      <documentation>
+         [Enter extension point usage example here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         [Enter API information here.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="implementation"/>
+      </appInfo>
+      <documentation>
+         [Enter information about supplied implementation of this extension point.]
+      </documentation>
+   </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="copyright"/>
+      </appInfo>
+      <documentation>
+         
+      </documentation>
+   </annotation>
+
+</schema>
diff --git a/tests/org.eclipse.wst.common.tests.ui/.classpath b/tests/org.eclipse.wst.common.tests.ui/.classpath
new file mode 100644
index 0000000..065ac06
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.wst.common.tests.ui/.project b/tests/org.eclipse.wst.common.tests.ui/.project
new file mode 100644
index 0000000..8efe78d
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.wst.common.tests.ui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/org.eclipse.wst.common.tests.ui/build.properties b/tests/org.eclipse.wst.common.tests.ui/build.properties
new file mode 100644
index 0000000..1c52d49
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/build.properties
@@ -0,0 +1,4 @@
+source.ui.jar = src/
+output.ui.jar = bin/
+bin.includes = plugin.xml,\
+               ui.jar
diff --git a/tests/org.eclipse.wst.common.tests.ui/plugin.xml b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
new file mode 100644
index 0000000..0ca05f2
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/plugin.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin
+   id="org.eclipse.wst.common.tests.ui"
+   name="Ui Plug-in"
+   version="1.0.0"
+   provider-name=""
+   class="org.eclipse.wst.common.tests.ui.UiPlugin">
+
+   <runtime>
+      <library name="ui.jar">
+         <export name="*"/>
+      </library>
+   </runtime>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.wst.common.frameworks.ui"/>
+      <import plugin="org.eclipse.wst.common.tests"/>
+   </requires>
+
+   <extension
+         point="org.eclipse.wst.common.tests.collector.suites">
+         <suite
+            class="org.eclipse.wst.common.tests.ui.DataModelUIAPITests"
+            name="DataModel UI API Tests">
+         </suite>
+   </extension>
+   <extension
+         point="org.eclipse.wst.common.frameworks.ui.DataModelWizardExtension">
+      <DataModelWizard
+            class="org.eclipse.wst.common.tests.ui.TestDataModelWizard"
+            id="org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel"/>
+   </extension>
+  
+
+</plugin>
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
new file mode 100644
index 0000000..caf613e
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIAPITests.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.tests.ui;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.wst.common.tests.SimpleTestSuite;
+
+/**
+ * @author jsholl
+ * 
+ * TODO To change the template for this generated type comment go to Window - Preferences - Java -
+ * Code Style - Code Templates
+ */
+public class DataModelUIAPITests extends TestSuite {
+
+	public static Test suite() {
+		return new DataModelUIAPITests();
+	}
+
+	public DataModelUIAPITests() {
+		super();
+		addTest(new SimpleTestSuite(DataModelUIFactoryTest.class));
+	}
+}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
new file mode 100644
index 0000000..55ca4af
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/DataModelUIFactoryTest.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.tests.ui;
+
+import junit.framework.TestCase;
+
+import org.eclipse.wst.common.frameworks.datamodel.provisional.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.provisional.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.ui.provisional.DataModelWizard;
+import org.eclipse.wst.common.frameworks.datamodel.ui.provisional.DataModelWizardFactory;
+
+public class DataModelUIFactoryTest extends TestCase {
+
+	public void testValidExtensionID() {
+		IDataModel dataModel = DataModelFactory.INSTANCE.createDataModel("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel");
+		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
+		DataModelWizard wizard = DataModelWizardFactory.INSTANCE.createWizard("org.eclipse.wst.common.frameworks.datamodel.tests.ITestDataModel");
+		assertNotNull(wizard);
+	}
+
+
+	public void testValidExtensionClass() {
+		IDataModel dataModel = DataModelFactory.INSTANCE.createDataModel(ITestDataModel.class);
+		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
+		DataModelWizard wizard = DataModelWizardFactory.INSTANCE.createWizard(ITestDataModel.class);
+		assertNotNull(wizard);
+	}
+
+	public void testValidExtensionInstance() {
+		IDataModel dataModel = DataModelFactory.INSTANCE.createDataModel(new TestDataModelProvider());
+		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
+		DataModelWizard wizard = DataModelWizardFactory.INSTANCE.createWizard(dataModel);
+		assertNotNull(wizard);
+		assertTrue(dataModel == ((TestDataModelWizard) wizard).getDataModel());
+	}
+
+}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
new file mode 100644
index 0000000..4532f21
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/TestDataModelWizard.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2003, 2005 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.wst.common.tests.ui;
+
+import org.eclipse.wst.common.frameworks.datamodel.provisional.IDataModel;
+import org.eclipse.wst.common.frameworks.datamodel.provisional.IDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.tests.TestDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.ui.provisional.DataModelWizard;
+
+public class TestDataModelWizard extends DataModelWizard {
+
+	public TestDataModelWizard(IDataModel dataModel) {
+		super(dataModel);
+	}
+
+	public IDataModel getDataModel() {
+		return model;
+	}
+
+	protected IDataModelProvider getDefaultProvider() {
+		return new TestDataModelProvider();
+	}
+
+}
diff --git a/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
new file mode 100644
index 0000000..421a1a2
--- /dev/null
+++ b/tests/org.eclipse.wst.common.tests.ui/src/org/eclipse/wst/common/tests/ui/UiPlugin.java
@@ -0,0 +1,84 @@
+package org.eclipse.wst.common.tests.ui;
+
+import org.eclipse.ui.plugin.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.osgi.framework.BundleContext;
+import java.util.*;
+
+/**
+ * The main plugin class to be used in the desktop.
+ */
+public class UiPlugin extends AbstractUIPlugin {
+	//The shared instance.
+	private static UiPlugin plugin;
+	//Resource bundle.
+	private ResourceBundle resourceBundle;
+	
+	/**
+	 * The constructor.
+	 */
+	public UiPlugin() {
+		super();
+		plugin = this;
+	}
+
+	/**
+	 * This method is called upon plug-in activation
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+	}
+
+	/**
+	 * This method is called when the plug-in is stopped
+	 */
+	public void stop(BundleContext context) throws Exception {
+		super.stop(context);
+		plugin = null;
+		resourceBundle = null;
+	}
+
+	/**
+	 * Returns the shared instance.
+	 */
+	public static UiPlugin getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the string from the plugin's resource bundle,
+	 * or 'key' if not found.
+	 */
+	public static String getResourceString(String key) {
+		ResourceBundle bundle = UiPlugin.getDefault().getResourceBundle();
+		try {
+			return (bundle != null) ? bundle.getString(key) : key;
+		} catch (MissingResourceException e) {
+			return key;
+		}
+	}
+
+	/**
+	 * Returns the plugin's resource bundle,
+	 */
+	public ResourceBundle getResourceBundle() {
+		try {
+			if (resourceBundle == null)
+				resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.common.tests.ui.UiPluginResources");
+		} catch (MissingResourceException x) {
+			resourceBundle = null;
+		}
+		return resourceBundle;
+	}
+
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.common.tests.ui", path);
+	}
+}
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/A.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/A.java
index ffb3a42..d24fd80 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/A.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/A.java
@@ -18,4 +18,9 @@
 	public String[] getPropertyNames() {
 		return new String[]{P};
 	}
+
+	public String getID() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/B.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/B.java
index d2154f3..3f0d24b 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/B.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/B.java
@@ -18,4 +18,9 @@
 	public String[] getPropertyNames() {
 		return new String[]{P};
 	}
+
+	public String getID() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/C.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/C.java
index a0d8b85..cc07941 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/C.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/C.java
@@ -18,4 +18,9 @@
 	public String[] getPropertyNames() {
 		return new String[]{P};
 	}
+
+	public String getID() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/DataModelFactoryTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/DataModelFactoryTest.java
index bce3bc6..bfad394 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/DataModelFactoryTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/DataModelFactoryTest.java
@@ -10,11 +10,11 @@
  *******************************************************************************/
 package org.eclipse.wst.common.frameworks.datamodel.tests;
 
+import junit.framework.TestCase;
+
 import org.eclipse.wst.common.frameworks.datamodel.provisional.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.provisional.IDataModel;
 
-import junit.framework.TestCase;
-
 public class DataModelFactoryTest extends TestCase {
 
 
@@ -53,6 +53,7 @@
 		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
 	}
 
+
 	public void testValidExtensionClass() {
 		IDataModel dataModel = DataModelFactory.INSTANCE.createDataModel(ITestDataModel.class);
 		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
@@ -63,4 +64,6 @@
 		assertTrue(dataModel.isProperty(ITestDataModel.FOO));
 	}
 
+
+
 }
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/SimpleDataModelTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/SimpleDataModelTest.java
index ea65fca..fcfd545 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/SimpleDataModelTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/SimpleDataModelTest.java
@@ -99,6 +99,10 @@
 			}
 			return null;
 		}
+
+		public String getID() {
+			return null;
+		}
 	};
 
 	private IDataModel dm;
@@ -155,7 +159,7 @@
 		}
 		Assert.assertNotNull(ex);
 		Assert.assertTrue(ex.getMessage().startsWith(PROPERTY_NOT_LOCATED_));
-		
+
 	}
 
 	public void testPropertyDescriptors() {
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/TestDataModelProvider.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/TestDataModelProvider.java
index 75785c2..e331c05 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/TestDataModelProvider.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/datamodel/tests/TestDataModelProvider.java
@@ -18,4 +18,8 @@
 		return new String[]{ITestDataModel.FOO};
 	}
 
+	public String getID() {
+		return ITestDataModel.class.getName();
+	}
+
 }
diff --git a/tests/org.eclipse.wst.common.tests/plugin.xml b/tests/org.eclipse.wst.common.tests/plugin.xml
index 2583c5f..47433eb 100644
--- a/tests/org.eclipse.wst.common.tests/plugin.xml
+++ b/tests/org.eclipse.wst.common.tests/plugin.xml
@@ -18,26 +18,27 @@
       <import plugin="org.eclipse.core.resources" export="true"/>
       <import plugin="org.eclipse.core.boot" export="true"/>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.wst.common.frameworks"/>
+      <import plugin="org.eclipse.wst.common.frameworks" export="true"/>
       <import plugin="org.eclipse.wst.common.emfworkbench.integration"/>
       <import plugin="org.eclipse.emf.common"/>
       <import plugin="org.eclipse.emf.ecore"/>
       <import plugin="org.eclipse.wst.common.modulecore"/>
+      <import plugin="org.eclipse.wst.common.tests.collector" export="true"/>
    </requires>
    <extension-point id="DataModelVerifier" name="Data Model Verifier Factory Extension" schema="schema/dataModelVerifier.exsd"/>
 
    <extension
          point="org.eclipse.wst.common.tests.collector.suites">
          <suite
-            suiteClass="org.eclipse.wst.common.frameworks.operations.tests.WTPOperationAPITests"
-            suiteName="WTP Operation API Tests">
+            class="org.eclipse.wst.common.frameworks.operations.tests.WTPOperationAPITests"
+            name="WTP Operation API Tests">
          </suite>
    </extension>
    <extension
          point="org.eclipse.wst.common.tests.collector.suites">
          <suite
-            suiteClass="org.eclipse.wst.common.frameworks.datamodel.tests.DataModelAPITests"
-            suiteName="IDataModel API Tests">
+            class="org.eclipse.wst.common.frameworks.datamodel.tests.DataModelAPITests"
+            name="IDataModel API Tests">
          </suite>
    </extension>
    <extension