Remove unneeded dependencies - prevent dependency cycles.
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
index 5a5934a..20fd605 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/META-INF/MANIFEST.MF
@@ -5,11 +5,7 @@
 Bundle-Version: 0.9.0
 Fragment-Host: org.eclipse.amp.axf.ide
 Require-Bundle: org.eclipse.swtbot.eclipse.finder,
- org.eclipse.swtbot.swt.finder,
  org.eclipse.core.resources,
- org.eclipse.amp.agf.chart,
- org.eclipse.amp.agf.core,
- org.eclipse.amp.agf.ide,
  org.eclipse.amp.escape.ide,
  org.eclipse.amp.escape.ascape,
  org.ascape.core,
diff --git a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
index c108240..45cb72a 100644
--- a/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
+++ b/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test/src/org/eclipse/amp/axf/ide/ModelViewManagerTest.java
@@ -3,9 +3,9 @@
 import static org.junit.Assert.fail;
 
 import org.ascape.model.Scape;
-import org.eclipse.amp.agf.gef.ModelEditPartInput;
 import org.eclipse.amp.axf.core.IEngine;
 import org.eclipse.amp.axf.core.IModel;
+import org.eclipse.amp.axf.view.ModelInput;
 import org.eclipse.amp.escape.ascape.wrap.ScapeWrapperModel;
 import org.eclipse.amp.escape.ide.EclipseEscapeRunner;
 import org.junit.Before;
@@ -15,12 +15,13 @@
 
 	private ModelViewManager classToTest;
 
-	private ModelEditPartInput modelInput;
+	private DummyModelInput modelInput;
 
 	@Before
 	public void setUp() throws Exception {
 		classToTest = ModelViewManager.createNewInstance();
 		EclipseEscapeRunner runner = new EclipseEscapeRunner() {
+
 			@Override
 			public void close() {
 				//
@@ -29,7 +30,7 @@
 		SimpleModel model = new SimpleModel(new Scape());
 		model.engine = runner;
 		classToTest.register(model, runner);
-		modelInput = new ModelEditPartInput(model, null);
+		modelInput = new DummyModelInput(model);
 	}
 
 	/**
@@ -50,6 +51,7 @@
 	}
 
 	private class ObserverThread extends Thread {
+
 		Thread mainThread;
 
 		boolean mainThreadInterrupted = false;
@@ -71,6 +73,7 @@
 	}
 
 	private class SimpleModel extends ScapeWrapperModel implements IModel {
+
 		IEngine engine;
 
 		public SimpleModel(Scape scape) {
@@ -83,4 +86,12 @@
 		}
 
 	}
+
+	private class DummyModelInput extends ModelInput {
+
+		public DummyModelInput(IModel model) {
+			super(model);
+		}
+
+	}
 }