https://bugs.eclipse.org/bugs/show_bug.cgi?id=96427
diff --git a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
index 489b81f..aa07629 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
@@ -3,7 +3,7 @@
 
 <!--
 /*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * 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 Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,14 +12,14 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.5.2.2 2004/10/19 19:13:02 khussey Exp $
+ * $Id: plugin.xml,v 1.5.2.3 2005/05/25 17:21:21 khussey Exp $
  */
 -->
 
 <plugin
    id="org.eclipse.uml2.tests"
    name="%pluginName"
-   version="1.0.2"
+   version="1.0.3"
    provider-name="%providerName">
 
    <runtime>
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ProfileOperationsTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ProfileOperationsTest.java
index 05eb265..ce111f7 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ProfileOperationsTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/ProfileOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * 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 Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: ProfileOperationsTest.java,v 1.1 2004/04/29 14:56:55 khussey Exp $
+ * $Id: ProfileOperationsTest.java,v 1.1.2.1 2005/05/25 17:21:21 khussey Exp $
  */
 package org.eclipse.uml2.internal.operation.tests;
 
@@ -51,7 +51,7 @@
  * A test case for the '<em><b>Profile Operations</b></em>' utility.
  */
 public class ProfileOperationsTest
-	extends UML2OperationsTest {
+		extends UML2OperationsTest {
 
 	public static void main(String[] args) {
 		TestRunner.run(ProfileOperationsTest.class);
@@ -77,7 +77,7 @@
 	 * @see junit.framework.TestCase#setUp()
 	 */
 	protected void setUp()
-		throws Exception {
+			throws Exception {
 
 		super.setUp();
 
@@ -101,15 +101,17 @@
 
 		ExtensionEnd extensionEnd = (ExtensionEnd) extension
 			.createOwnedEnd(UML2Package.eINSTANCE.getExtensionEnd());
-		extensionEnd.setName(StereotypeOperations.STEREOTYPE_EXTENSION_ROLE_PREFIX
-			+ stereotype.getName());
+		extensionEnd
+			.setName(StereotypeOperations.STEREOTYPE_EXTENSION_ROLE_PREFIX
+				+ stereotype.getName());
 		extensionEnd.setType(stereotype);
 
 		Property stereotypeEnd = stereotype
 			.createOwnedAttribute(UML2Package.eINSTANCE.getProperty());
 		stereotypeEnd.setAssociation(extension);
-		stereotypeEnd.setName(StereotypeOperations.METACLASS_EXTENSION_ROLE_PREFIX
-			+ UML2Package.eINSTANCE.getClass_().getName());
+		stereotypeEnd
+			.setName(StereotypeOperations.METACLASS_EXTENSION_ROLE_PREFIX
+				+ UML2Package.eINSTANCE.getClass_().getName());
 		stereotypeEnd.setType(metamodel.getOwnedType(UML2Package.eINSTANCE
 			.getClass_().getName()));
 
@@ -196,11 +198,11 @@
 
 		EnumerationLiteral enumerationLiteral0 = enumeration
 			.createOwnedLiteral(UML2Package.eINSTANCE.getEnumerationLiteral());
-		enumerationLiteral0.setName(getName() + String.valueOf(0));
+		enumerationLiteral0.setName(getName() + ' ' + String.valueOf(0));
 
 		EnumerationLiteral enumerationLiteral1 = enumeration
 			.createOwnedLiteral(UML2Package.eINSTANCE.getEnumerationLiteral());
-		enumerationLiteral1.setName(getName() + String.valueOf(1));
+		enumerationLiteral1.setName(getName() + ' ' + String.valueOf(1));
 
 		Property enumerationProperty = stereotype
 			.createOwnedAttribute(UML2Package.eINSTANCE.getProperty());
@@ -402,13 +404,14 @@
 			.getEStructuralFeature("enumeration"); //$NON-NLS-1$
 		stereotypeEObject.eSet(enumerationEStructuralFeature,
 			((EEnum) enumerationEStructuralFeature.getEType()).getEEnumLiteral(
-				getName() + String.valueOf(0)).getInstance());
+				getName() + ' ' + String.valueOf(0)).getInstance());
 
 		EStructuralFeature enumerationsEStructuralFeature = eClass
 			.getEStructuralFeature("enumerations"); //$NON-NLS-1$
 		((List) stereotypeEObject.eGet(enumerationsEStructuralFeature))
 			.add(((EEnum) enumerationsEStructuralFeature.getEType())
-				.getEEnumLiteral(getName() + String.valueOf(1)).getInstance());
+				.getEEnumLiteral(getName() + ' ' + String.valueOf(1))
+				.getInstance());
 
 		EStructuralFeature timestampEStructuralFeature = eClass
 			.getEStructuralFeature("timestamp"); //$NON-NLS-1$
@@ -483,14 +486,16 @@
 
 		enumerationEStructuralFeature = eClass
 			.getEStructuralFeature("enumeration"); //$NON-NLS-1$
-		assertEquals(((EEnum) enumerationEStructuralFeature.getEType())
-			.getEEnumLiteral(getName() + String.valueOf(0)).getInstance(),
+		assertEquals(
+			((EEnum) enumerationEStructuralFeature.getEType()).getEEnumLiteral(
+				getName() + ' ' + String.valueOf(0)).getInstance(),
 			stereotypeEObject.eGet(enumerationEStructuralFeature));
 
 		enumerationsEStructuralFeature = eClass
 			.getEStructuralFeature("enumerations"); //$NON-NLS-1$
-		assertEquals(((EEnum) enumerationEStructuralFeature.getEType())
-			.getEEnumLiteral(getName() + String.valueOf(1)).getInstance(),
+		assertEquals(
+			((EEnum) enumerationEStructuralFeature.getEType()).getEEnumLiteral(
+				getName() + ' ' + String.valueOf(1)).getInstance(),
 			((List) stereotypeEObject.eGet(enumerationsEStructuralFeature))
 				.get(0));
 
diff --git a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/StereotypeOperationsTest.java b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/StereotypeOperationsTest.java
index f82846e..913dd17 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/StereotypeOperationsTest.java
+++ b/deprecated/tests/org.eclipse.uml2.tests/src/org/eclipse/uml2/internal/operation/tests/StereotypeOperationsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * 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 Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
  * Contributors:
  *   IBM - Initial API and implementation
  *
- * $Id: StereotypeOperationsTest.java,v 1.1 2004/04/29 14:56:55 khussey Exp $
+ * $Id: StereotypeOperationsTest.java,v 1.1.2.1 2005/05/25 17:21:21 khussey Exp $
  */
 package org.eclipse.uml2.internal.operation.tests;
 
@@ -50,7 +50,7 @@
  * A test case for the '<em><b>Stereotype Operations</b></em>' utility.
  */
 public class StereotypeOperationsTest
-	extends UML2OperationsTest {
+		extends UML2OperationsTest {
 
 	/**
 	 * The enumeration for this Stereotype Operations test case.
@@ -95,7 +95,7 @@
 	 * @see junit.framework.TestCase#setUp()
 	 */
 	protected void setUp()
-		throws Exception {
+			throws Exception {
 
 		Profile profile = UML2Factory.eINSTANCE.createProfile();
 		profile.setName(getName());
@@ -117,15 +117,17 @@
 
 		ExtensionEnd extensionEnd = (ExtensionEnd) extension
 			.createOwnedEnd(UML2Package.eINSTANCE.getExtensionEnd());
-		extensionEnd.setName(StereotypeOperations.STEREOTYPE_EXTENSION_ROLE_PREFIX
-			+ getElement().getName());
+		extensionEnd
+			.setName(StereotypeOperations.STEREOTYPE_EXTENSION_ROLE_PREFIX
+				+ getElement().getName());
 		extensionEnd.setType(getElement());
 
 		Property stereotypeEnd = getElement().createOwnedAttribute(
 			UML2Package.eINSTANCE.getProperty());
 		stereotypeEnd.setAssociation(extension);
-		stereotypeEnd.setName(StereotypeOperations.METACLASS_EXTENSION_ROLE_PREFIX
-			+ UML2Package.eINSTANCE.getClass_().getName());
+		stereotypeEnd
+			.setName(StereotypeOperations.METACLASS_EXTENSION_ROLE_PREFIX
+				+ UML2Package.eINSTANCE.getClass_().getName());
 		stereotypeEnd.setType(metamodel.getOwnedType(UML2Package.eINSTANCE
 			.getClass_().getName()));
 
@@ -212,11 +214,11 @@
 
 		EnumerationLiteral enumerationLiteral0 = getEnumeration()
 			.createOwnedLiteral(UML2Package.eINSTANCE.getEnumerationLiteral());
-		enumerationLiteral0.setName(getName() + String.valueOf(0));
+		enumerationLiteral0.setName(getName() + ' ' + String.valueOf(0));
 
 		EnumerationLiteral enumerationLiteral1 = getEnumeration()
 			.createOwnedLiteral(UML2Package.eINSTANCE.getEnumerationLiteral());
-		enumerationLiteral1.setName(getName() + String.valueOf(1));
+		enumerationLiteral1.setName(getName() + ' ' + String.valueOf(1));
 
 		Property enumerationProperty = getElement().createOwnedAttribute(
 			UML2Package.eINSTANCE.getProperty());
@@ -345,7 +347,8 @@
 			if (Extension.class.isInstance(ownedAttribute.getAssociation())) {
 				((ExtensionEnd) ownedAttribute.getAssociation().getOwnedEnds()
 					.get(0)).setLowerBound(required
-					? 1 : 0);
+					? 1
+					: 0);
 			}
 		}
 	}
@@ -1733,7 +1736,7 @@
 
 		stereotypeEObject.eSet(enumerationEStructuralFeature,
 			((EEnum) enumerationEStructuralFeature.getEType()).getEEnumLiteral(
-				getName() + String.valueOf(0)).getInstance());
+				getName() + ' ' + String.valueOf(0)).getInstance());
 
 		try {
 			value = StereotypeOperations.getValue(getElement(), class_,
@@ -1871,7 +1874,8 @@
 
 		((List) stereotypeEObject.eGet(enumerationsEStructuralFeature))
 			.add(((EEnum) enumerationsEStructuralFeature.getEType())
-				.getEEnumLiteral(getName() + String.valueOf(0)).getInstance());
+				.getEEnumLiteral(getName() + ' ' + String.valueOf(0))
+				.getInstance());
 
 		try {
 			value = StereotypeOperations.getValue(getElement(), class_,
diff --git a/tests/org.eclipse.uml2.tests-feature/feature.xml b/tests/org.eclipse.uml2.tests-feature/feature.xml
index 125bcde..24a4e20 100644
--- a/tests/org.eclipse.uml2.tests-feature/feature.xml
+++ b/tests/org.eclipse.uml2.tests-feature/feature.xml
@@ -3,7 +3,7 @@
 
 <!--
 /*
- * Copyright (c) 2003, 2004 IBM Corporation and others.
+ * 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 Common Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,14 +12,14 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: feature.xml,v 1.2.2.4 2004/10/19 19:16:12 khussey Exp $
+ * $Id: feature.xml,v 1.2.2.5 2005/05/25 17:21:22 khussey Exp $
  */
 -->
 
 <feature
       id="org.eclipse.uml2.tests"
       label="%feature-label"
-      version="1.0.2"
+      version="1.0.3"
       provider-name="%feature.provider-name"
       image="eclipse_update_120.jpg">
 
@@ -47,7 +47,7 @@
          id="org.eclipse.uml2.tests"
          download-size="0"
          install-size="0"
-         version="1.0.2"/>
+         version="1.0.3"/>
 
    <plugin
          id="org.eclipse.uml2.edit.tests"