+ Remove obsolete method
+ Enable more tests
+ Properly configure OTProjects (required for AddImportQuickFixTest).
diff --git a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTQuickFixTest.java b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTQuickFixTest.java
index 35f9741..bae6df8 100644
--- a/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTQuickFixTest.java
+++ b/testplugins/org.eclipse.objectteams.otdt.ui.tests/src/org/eclipse/objectteams/otdt/ui/tests/core/OTQuickFixTest.java
@@ -21,25 +21,22 @@
 package org.eclipse.objectteams.otdt.ui.tests.core;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Hashtable;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.core.resources.IProjectDescription;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
-import org.eclipse.jdt.internal.ui.text.correction.AssistContext;
 import org.eclipse.jdt.testplugin.JavaProjectHelper;
 import org.eclipse.jdt.testplugin.TestOptions;
 import org.eclipse.jdt.ui.tests.quickfix.QuickFixTest;
 import org.eclipse.objectteams.otdt.core.ext.OTDTPlugin;
+import org.eclipse.objectteams.otdt.core.ext.OTJavaNature;
+import org.eclipse.objectteams.otdt.core.ext.OTREContainer;
 
 public class OTQuickFixTest extends QuickFixTest {
 
@@ -58,7 +55,10 @@
 		suite.addTest(CallinQuickFixTest.suite());
 		suite.addTest(UnresolvedMethodsQuickFixTest.suite());
 		suite.addTest(OTJavadocQuickFixTest.suite());
-
+		suite.addTest(AddImportQuickFixTest.suite());
+		suite.addTest(JavaQuickFixTests.suite());
+		suite.addTest(PrecedenceQuickFixTest.suite());
+		suite.addTest(StatementQuickFixTest.suite());
 		return suite;
 	}
 
@@ -87,6 +87,12 @@
 		JavaCore.setOptions(options);			
 		
 		fJProject1= ProjectTestSetup.getProject();
+		if (!OTJavaNature.hasOTJavaNature(fJProject1.getProject())) {
+			IProjectDescription description = fJProject1.getProject().getDescription();
+			description.setNatureIds(OTDTPlugin.createProjectNatures(description));
+			fJProject1.getProject().setDescription(description, null);
+			OTREContainer.initializeOTJProject(fJProject1.getProject());
+		}
 		
 		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
 	}
@@ -94,21 +100,4 @@
 	protected void tearDown() throws Exception {
 		JavaProjectHelper.clear(fJProject1, ProjectTestSetup.getDefaultClasspath());
 	}
-
-//	// variant to test against non-first problem:
-//	protected static final ArrayList collectCorrections(ICompilationUnit cu, CompilationUnit astRoot, int nProblems, int iProblem, AssistContext context) throws CoreException {
-//		IProblem[] problems= astRoot.getProblems();
-//		if (problems.length != nProblems) {
-//			StringBuffer buf= new StringBuffer("Wrong number of problems, is: ");
-//			buf.append(problems.length).append(", expected: ").append(nProblems).append('\n');
-//			for (int i= 0; i < problems.length; i++) {
-//				buf.append(problems[i]);
-//				buf.append('[').append(problems[i].getSourceStart()).append(" ,").append(problems[i].getSourceEnd()).append(']');
-//				buf.append('\n');
-//			}
-//			assertTrue(buf.toString(), false);
-//
-//		}
-//		return collectCorrections(cu, problems[iProblem], context);
-//	}
 }