--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/D.java	
@@ -1,5 +1,4 @@ 
 import java.io.IOException;
-import java.net.MalformedURLException;
 
 public class D {
 	public static class MyException extends Exception {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1054.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1054.java	
@@ -1,4 +1,4 @@ 
-package destination_in;
+package destination_out;
 
 public class A_test1054 {
 	public class Inner {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1055.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1055.java	
@@ -1,4 +1,4 @@ 
-package destination_in;
+package destination_out;
 
 import java.util.concurrent.Callable;
 
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1056.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1056.java	
@@ -1,4 +1,4 @@ 
-package destination_in;
+package destination_out;
 
 public class A_test1056 {
 	public class Inner {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1057.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1057.java	
@@ -1,4 +1,4 @@ 
-package destination_in;
+package destination_out;
 
 public class A_test1057 {
 	public static class Inner {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1058.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/destination_out/A_test1058.java	
@@ -1,4 +1,4 @@ 
-package destination_in;
+package destination_out;
 
 public class A_test1058 {
 	private enum B {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test965.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test965.java	
@@ -1,6 +1,6 @@ 
 package duplicates_in;
 
-public class A_test964 {
+public class A_test965 {
 	boolean test() {
 		Object x= null;
 		if (true) {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test966.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test966.java	
@@ -2,7 +2,7 @@ package duplicates_in;
 
 import java.util.List;
 
-public class A_test964 {
+public class A_test966 {
 	boolean test() {
 		Object x= null;
 		List l= null;
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test967.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test967.java	
@@ -1,8 +1,6 @@ 
 package duplicates_in;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test967 {
 	public void test() {
 		/*[*/foo();
 		foo();/*]*/
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test968.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test968.java	
@@ -1,8 +1,6 @@ 
 package duplicates_in;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test968 {
 	public void test() {
 		/*[*/foo();
 		foo();/*]*/
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test969.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_in/A_test969.java	
@@ -1,8 +1,6 @@ 
 package duplicates_in;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test969 {
 	public void test() {
 		/*[*/foo();
 		foo();/*]*/
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test965.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test965.java	
@@ -1,6 +1,6 @@ 
 package duplicates_out;
 
-public class A_test964 {
+public class A_test965 {
 	boolean test() {
 		Object x= null;
 		if (true) {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test966.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test966.java	
@@ -2,7 +2,7 @@ package duplicates_out;
 
 import java.util.List;
 
-public class A_test964 {
+public class A_test966 {
 	boolean test() {
 		Object x= null;
 		List l= null;
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test967.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test967.java	
@@ -1,8 +1,6 @@ 
 package duplicates_out;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test967 {
 	public void test() {
 		extracted();
 		
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test968.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test968.java	
@@ -1,8 +1,6 @@ 
 package duplicates_out;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test968 {
 	public void test() {
 		extracted();
 
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test969.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/duplicates_out/A_test969.java	
@@ -1,8 +1,6 @@ 
 package duplicates_out;
 
-import java.util.List;
-
-public class A_test964 {
+public class A_test969 {
 	public void test() {
 		extracted();
 
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test614.java	
@@ -1,7 +1,5 @@ 
 package expression_in;
 
-import java.io.File;
-
 public class A_test614 {
 	public void foo() {
 		A a= null;
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test629.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_in/A_test629.java	
@@ -1,6 +1,6 @@ 
 package expression_in;
 
-public class A_test627 {
+public class A_test629 {
 
 	public void foo() {
 		int i= 1 - /*[*/((2 + 3))/*]*/;
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test628.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test628.java	
@@ -1,6 +1,6 @@ 
 package expression_out;
 
-public class A_test627 {
+public class A_test628 {
 
 	public void foo() {
 		int i= 1 - extracted();
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test629.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/expression_out/A_test629.java	
@@ -1,6 +1,6 @@ 
 package expression_out;
 
-public class A_test627 {
+public class A_test629 {
 
 	public void foo() {
 		int i= 1 - extracted();
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1120.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_in/A_test1120.java	
@@ -1,5 +1,7 @@ 
 package generics_in;
 
+import java.util.List;
+
 public class A_test1120 {
 
 	<T extends Comparable<? super T>> void method(List<T> list) {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1120.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/generics_out/A_test1120.java	
@@ -1,5 +1,7 @@ 
 package generics_out;
 
+import java.util.List;
+
 public class A_test1120 {
 
 	<T extends Comparable<? super T>> void method(List<T> list) {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test729.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test729.java	
@@ -1,4 +1,4 @@ 
-package return_in;
+package return_out;
 
 public class A_test729 {
 	public void foo(int x) {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test733.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test733.java	
@@ -1,4 +1,4 @@ 
-package return_in;
+package return_out;
 
 public class A_test733 {
 	public int foo() {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test734.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/return_out/A_test734.java	
@@ -1,4 +1,4 @@ 
-package return_in;
+package return_out;
 
 public class A_test734 {
 	public int foo() {
--- a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java	
+++ a/org.eclipse.jdt.ui.tests.refactoring/resources/ExtractMethodWorkSpace/ExtractMethodTests/testing/E.java	
@@ -1,7 +1,5 @@ 
 package testing;
 
-import java.awt.peer.LabelPeer;
-
 public class E {
 	private F f;
 	public void foo() {