diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java
index e7820dafe0d..738ed813507 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTest.java
@@ -15,14 +15,17 @@ import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.rse.core.IRSESystemType;
 import org.eclipse.rse.core.model.ISystemResourceSet;
 import org.eclipse.rse.core.model.SystemRemoteResourceSet;
 import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
 import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
 import org.eclipse.rse.tests.RSETestsPlugin;
+import org.eclipse.rse.ui.RSEUIPlugin;
 
 public class FileServiceArchiveTest extends FileServiceBaseTest {
 
@@ -312,12 +315,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, tempDir, mon, true);
 		
 		IRemoteFile zipSource1 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName1, false);
-		assertTrue(zipSource1 != null);
+		assertNotNull(zipSource1);
 		IRemoteFile zipSourceFolder = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName1);
 		fss.copy(zipSourceFolder, zipSource1, folderToCopyName1, mon);
 		
 		IRemoteFile zipSource2 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName2, false);
-		assertTrue(zipSource2 != null);
+		assertNotNull(zipSource2);
 		IRemoteFile zipSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName2);
 		fss.copy(zipSourceFolder2, zipSource2, folderToCopyName2, mon);
 		
@@ -327,6 +330,55 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Then, delete the temp folder in the junit workspace.
 		temp.delete(EFS.NONE, mon);
 	}
+	
+	protected void createSuperTransferFolder(IFileStore temp) throws Exception 
+	{
+		
+		String content = getRandomString();
+		
+		// create the source folder used for copy or move
+		IFileStore folderToCopy = temp.getChild(folderToCopyName3);
+		createDir(folderToCopy, true);
+		//Now, populate the contents in the folderToCopy.
+		IFileStore aaaaaaaa = folderToCopy.getChild("aaaaaaaa");
+		createDir(aaaaaaaa, true);
+		//create file inside the aaaaaaaa folder.
+		IFileStore adsf = aaaaaaaa.getChild("adsf");
+		content = getRandomString();
+		createFile(adsf, content);
+		IFileStore eclipse_SDK_3_3M6_win32_zip = aaaaaaaa.getChild("eclipse-SDK-3.3M6-win32.zip");
+		createFile(eclipse_SDK_3_3M6_win32_zip, "");
+		IFileStore epdcdump01_hex12 = aaaaaaaa.getChild("epdcdump01.hex12");
+		content = getRandomString();
+		createFile(epdcdump01_hex12, content);
+		IFileStore epdcdump01_hex12aaaa = aaaaaaaa.getChild("epdcdump01.hex12aaaa");
+		content = getRandomString();
+		createFile(epdcdump01_hex12aaaa, content);
+		
+		IFileStore aaaab = folderToCopy.getChild("aaaab");
+		createDir(aaaab, true);
+		IFileStore features = aaaab.getChild("features");
+		createDir(features, true);
+		IFileStore dummyFile = features.getChild("dummy.txt");
+		content = getRandomString();
+		createFile(dummyFile, content);
+		//create file inside the aaaab folder.
+		content = "this is just a simple content \n to a simple file \n to test a 'simple' copy";
+		IFileStore epdcdump01_hex12a = aaaab.getChild("epdcdump01.hex12a");
+		content = getRandomString();
+		createFile(epdcdump01_hex12a, content);
+		
+		IFileStore epdcdump01_hex12a1 = folderToCopy.getChild("epdcdump01.hex12a");
+		content = getRandomString();
+		createFile(epdcdump01_hex12a1, content);
+		
+		IFileStore RSE_SDK_2_0RC1_zip = folderToCopy.getChild("RSE-SDK-2.0RC1.zip");
+		content = getRandomString();
+		createFile(RSE_SDK_2_0RC1_zip, content);
+		
+		return;
+
+	}
 
 	public void testCreateZipFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
@@ -364,15 +416,15 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Now, create some files inside the folder.
 		String secondLevelChildName = "ccc.exe";
 		IRemoteFile levelTwoChild1 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild1 != null);
+		assertNotNull(levelTwoChild1);
 		
 		secondLevelChildName = "ddd.bat";
 		IRemoteFile levelTwoChild2 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild2 != null);
+		assertNotNull(levelTwoChild2);
 		
 		secondLevelChildName = "another Folder"; //folder with space
 		IRemoteFile levelTwoChild3 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, true);
-		assertTrue(levelTwoChild3 != null);
+		assertNotNull(levelTwoChild3);
 		
 		//Now, check the contents
 		String[] namesToCheck1 = {"ccc.exe", "ddd.bat", "another Folder"};
@@ -393,16 +445,16 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Now, we want to create a text file inside.
 		String childName = "aaa.txt";
 		IRemoteFile file1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file1 != null);
+		assertNotNull(file1);
 		
 		childName = "bbb.txt";
 		IRemoteFile file2 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file2 != null);
+		assertNotNull(file2);
 		
 		//Create a folder
 		childName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, check the contents
 		String[] levelOneNamesToCheck = {"aaa.txt", "bbb.txt", "folder1"};
@@ -412,15 +464,15 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Now, create some files inside the folder.
 		String secondLevelChildName = "ccc.exe";
 		IRemoteFile levelTwoChild1 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild1 != null);
+		assertNotNull(levelTwoChild1);
 		
 		secondLevelChildName = "ddd.bat";
 		IRemoteFile levelTwoChild2 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild2 != null);
+		assertNotNull(levelTwoChild2);
 		
 		secondLevelChildName = "another Folder"; //folder with space
 		IRemoteFile levelTwoChild3 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, true);
-		assertTrue(levelTwoChild3 != null);
+		assertNotNull(levelTwoChild3);
 		
 		//Now, check the contents
 		String[] levelTwoNamesToCheck = {"ccc.exe", "ddd.bat", "another Folder"};
@@ -463,7 +515,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		String sourceZipFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceZipFileName);
@@ -477,7 +529,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
 		
-		assertTrue(movedVirtualFolder != null);
+		assertNotNull(movedVirtualFolder);
 		
 		String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
@@ -496,11 +548,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		String sourceZipFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceZipFileName);
-		assertTrue(sourceZipFile != null);
+		assertNotNull(sourceZipFile);
 		
 		//Now, move one of the level two folder from the zip file into folder1
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
@@ -512,7 +564,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
 		
-		assertTrue(movedVirtualFolder != null);
+		assertNotNull(movedVirtualFolder);
 		
 		String[] contents = {"Connections", "Filters", "profile.xmi"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
@@ -521,7 +573,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Now, make sure the moved virtual folder is gone from its original zip file
 		Object originalVirtualFolder = getChildFromFolder(firstLevelChild, movedFolderName);
 		
-		assertTrue(originalVirtualFolder == null);  //we should not be able to find it.
+		assertNull(originalVirtualFolder);  //we should not be able to find it.
 	}
 	
 	public void testMoveToArchiveFile() throws Exception {
@@ -532,17 +584,17 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String targetZipFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, targetZipFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, move one of the folder from the sourceFolder into copiedTargetZipFile
 		fss.move(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
 		
 		Object theMovedChild = getChildFromFolder(targetZipFile, sourceFolderName);
-		assertTrue(theMovedChild != null);
+		assertNotNull(theMovedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -554,7 +606,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//make sure the original folder is gone.
 		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
 		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-		assertFalse(originalSource != null);
+		assertNull(originalSource);
 	}
 	
 	public void testMoveToVirtualFileLevelOne() throws Exception {
@@ -565,11 +617,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String targetZipFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, targetZipFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, move one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and move the folder to there.
@@ -579,7 +631,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theMovedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
 		
-		assertTrue(theMovedChild != null);
+		assertNotNull(theMovedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -589,7 +641,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//make sure the original folder is gone.
 		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
 		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-		assertFalse(originalSource != null);
+		assertNull(originalSource);
 	}
 	
 	public void testMoveToVirtualFileLevelTwo() throws Exception {
@@ -614,7 +666,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theMovedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
 		
-		assertTrue(theMovedChild != null);
+		assertNotNull(theMovedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -624,7 +676,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//make sure the original folder is gone.
 		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
 		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-		assertFalse(originalSource != null);
+		assertNull(originalSource);
 	}
 	
 	
@@ -635,12 +687,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String sourceZipFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceZipFileName);
-		assertTrue(sourceZipFile != null);
+		assertNotNull(sourceZipFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the folder from the zip file into folder1
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
@@ -648,7 +700,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, folderToCopyName1);
 		
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
@@ -663,12 +715,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//copy the zip file first.
 		String sourceZipFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceZipFileName);
-		assertTrue(sourceZipFile != null);
+		assertNotNull(sourceZipFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the level two folder from the zip file into folder1
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
@@ -678,7 +730,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
 		
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"Connections", "Filters", "profile.xmi"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
@@ -694,18 +746,18 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String targetZipFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile =  (IRemoteFile)getChildFromFolder(tempDir, targetZipFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
 		fss.copy(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
 		
 		Object theCopiedChild = getChildFromFolder(targetZipFile, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -724,11 +776,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String targetZipFileName = zipSourceFileName1; 
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, targetZipFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and copy the folder to there.
@@ -739,7 +791,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -756,11 +808,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName3);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Get one of its second level children, and copy the folder to there.
 		//Now, copy one of the level two folder from the zip file into folder1
@@ -771,7 +823,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theCopiedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -787,12 +839,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir,zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		//Now, copy the source folder.
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir,sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
 		IRemoteFile[] sourceFiles = new IRemoteFile[3];
@@ -808,7 +860,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Checking the first copied folder
 		Object theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName1);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
@@ -819,7 +871,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Checking the second copied folder
 		theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName2);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck2 = {"features"};
@@ -829,7 +881,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		//Checking the third copied file
 		theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName3);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
@@ -841,11 +893,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and copy the folder to there.
@@ -857,7 +909,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 
 		Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -873,12 +925,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		//Now, copy the source folder.
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Get one of its second level children, and copy the folder to there.
 		//Now, copy one of the level two folder from the zip file into folder1
@@ -899,7 +951,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Checking the first copied folder
 		Object theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName1);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
@@ -910,7 +962,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		//Checking the second copied folder
 		theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName2);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck2 = {"features"};
@@ -920,7 +972,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		//Checking the third copied file
 		theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName3);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
@@ -931,41 +983,41 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String sourceFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir,sourceFileName);
-		assertTrue(sourceZipFile != null);
+		assertNotNull(sourceZipFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the folder from the zip file into folder1
 		Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
 		IRemoteFile[] sourceFiles = new IRemoteFile[3];
 		String childToCopyName1 = "Team";
 		sourceFiles[0] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName1);
-		assertTrue(sourceFiles[0] != null);
+		assertNotNull(sourceFiles[0]);
 		String childToCopyName2 = "xuanchentp";
 		sourceFiles[1] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName2);
-		assertTrue(sourceFiles[1] != null);
+		assertNotNull(sourceFiles[1]);
 		String childToCopyName3 = ".compatibility";
 		sourceFiles[2] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName3);
-		assertTrue(sourceFiles[2] != null);
+		assertNotNull(sourceFiles[2]);
 		fss.copyBatch(sourceFiles, folder1, mon);
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, childToCopyName1);
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		String[] contents1 = {"Connections", "Filters", "profile.xmi"};
 		int[] typesToCheck1 = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
 		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents1, typesToCheck1);
 		
 		copiedVirtualFolder = getChildFromFolder(folder1, childToCopyName2);
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		String[] contents2 = {"Connections", "Filters", "profile.xmi"};
 		int[] typesToCheck2 = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
 		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents2, typesToCheck2);
 		
 		Object copiedVirtualFile = getChildFromFolder(folder1, childToCopyName3);
-		assertTrue(copiedVirtualFile != null);
+		assertNotNull(copiedVirtualFile);
 		assertTrue(((IRemoteFile)copiedVirtualFile).isDirectory() != true);
 	}
 
@@ -976,12 +1028,12 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String sourceFileName = zipSourceFileName1;
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceZipFile != null);
+		assertNotNull(sourceZipFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the level two folder from the zip file into folder1
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
@@ -994,7 +1046,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
 		
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"Connections", "Filters", "profile.xmi"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
@@ -1008,11 +1060,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourcefileName = zipSourceFileName2;
 		IRemoteFile sourceFile = (IRemoteFile)getChildFromFolder(tempDir, sourcefileName);
-		assertTrue(sourceFile != null);
+		assertNotNull(sourceFile);
 		
 		//Now, copy one of the folder from the sourceFile into copiedTargetZipFile
 		IRemoteFile[] sourceFiles = new IRemoteFile[1];
@@ -1023,7 +1075,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theCopiedChild = getChildFromFolder(targetZipFile, virutalFolderToCopyName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"20070315a", "20070319", "20070320a", "20070404a", "dummyFolder"};
@@ -1039,11 +1091,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourcefileName = zipSourceFileName2;
 		IRemoteFile sourceFile = (IRemoteFile)getChildFromFolder(tempDir, sourcefileName);
-		assertTrue(sourceFile != null);
+		assertNotNull(sourceFile);
 		
 		//Now, copy one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and copy the folder to there.
@@ -1058,30 +1110,30 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		String virtualChildToCopyName3 = "dummyFolder";
 		
 		sourceFiles[0] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName1);
-		assertTrue(sourceFiles[0] != null);
+		assertNotNull(sourceFiles[0]);
 		sourceFiles[1] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName2);
-		assertTrue(sourceFiles[1] != null);
+		assertNotNull(sourceFiles[1]);
 		sourceFiles[2] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName3);
-		assertTrue(sourceFiles[2] != null);
+		assertNotNull(sourceFiles[2]);
 		fss.copyBatch(sourceFiles, ((IRemoteFile)childrenOfTargetZipFile[0]), mon);
 
 		
 		Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), virtualChildToCopyName1);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck1 = {"QB5ROUTaadd"};
 		int[] typesToCheck1 = {TYPE_FILE};
 		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
 		
 		theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), virtualChildToCopyName2);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck2 = {"QB5ROUTERa"};
 		int[] typesToCheck2 = {TYPE_FILE};
 		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
 		
 		theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), virtualChildToCopyName3);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck3 = {"20070404a", "epdcdump01.hex12ab"};
 		int[] typesToCheck3 = {TYPE_FOLDER, TYPE_FILE};
@@ -1095,11 +1147,11 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		String zipTargetFileName = zipSourceFileName1;
 		IRemoteFile targetZipFile = (IRemoteFile)getChildFromFolder(tempDir, zipTargetFileName);
-		assertTrue(targetZipFile != null);
+		assertNotNull(targetZipFile);
 		
 		String sourcefileName = zipSourceFileName2;
 		IRemoteFile sourceFile = (IRemoteFile)getChildFromFolder(tempDir,  sourcefileName);
-		assertTrue(sourceFile != null);
+		assertNotNull(sourceFile);
 		
 		//Get one of its second level children, and copy the folder to there.
 		//Now, copy one of the level two folder from the zip file into folder1
@@ -1119,12 +1171,52 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 		Object theCopiedChild = getChildFromFolder(parentOfVirtualFolderToCopy, virtualFolderToCopyName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"20070404a", "epdcdump01.hex12ab"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FILE};
 		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck, typesToCheck);
 	}
+	
+	public void testSuperTransferLocalToRemote() throws Exception {
+		String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
+		IFileStore temp = createDir(tempPath, true);
+		
+		createSuperTransferFolder(temp);
+		
+		//Set the superTransfer preference on
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		boolean preference_DOSUPERTRANSFER = store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+		store.setValue(ISystemFilePreferencesConstants.DOSUPERTRANSFER, true);
+		
+		//now, copy folderToCopy into the folder in the remote system
+		IRemoteFile sourceFolderToCopy1 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName3, mon);
+		ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy1).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet3 = new SystemRemoteResourceSet(localFss, srcAdapter1);
+		fromSet3.addResource(sourceFolderToCopy1);
+		ISystemResourceSet tempObjects3 = srcAdapter1.doDrag(fromSet3, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects3, tempDir, mon, true);
+		
+		//Then, we need to retrieve children of the tempDir to cache their information.
+		Object[] children = fss.resolveFilterString(tempDir, null, mon);
+		//Make sure there is no temp archive file left 
+		assertTrue(children.length == 1);
+		
+		Object theCopiedFolder = getChildFromFolder(tempDir, folderToCopyName3);
+		assertNotNull(theCopiedFolder);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
+		
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedFolder, childrenToCheck, typesToCheck);
+		
+		//Then, set the preference back to its original value
+		store.setValue(ISystemFilePreferencesConstants.DOSUPERTRANSFER, preference_DOSUPERTRANSFER);
+		
+		//Then, delete the temp folder in the junit workspace.
+		temp.delete(EFS.NONE, mon);
+	}
 
 }
diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java
index 2b9a763522c..305b64d72c8 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStore.java
@@ -12,6 +12,7 @@ package org.eclipse.rse.tests.subsystems.files;
 
 import junit.framework.TestSuite;
 
+import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -27,7 +28,9 @@ import org.eclipse.rse.core.subsystems.IRemoteServerLauncher;
 import org.eclipse.rse.core.subsystems.IServerLauncherProperties;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
+import org.eclipse.rse.core.subsystems.ServerLaunchType;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
+import org.eclipse.rse.internal.subsystems.files.core.ISystemFilePreferencesConstants;
 import org.eclipse.rse.services.files.IFileService;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -49,6 +52,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 	public static junit.framework.Test suite() {
 		TestSuite suite = new TestSuite("FileServiceArchiveTestDStore");
 		
+		
 		//zip file testing
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testCopyBatchToArchiveFile")); //$NON-NLS-1$
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testCopyBatchToVirtualFileLevelOne")); //$NON-NLS-1$
@@ -91,6 +95,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testCopyBatchToTarArchiveFile"));
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testCopyBatchToTarVirtualFileLevelFour"));
 		
+		//super transfer
+		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testSuperTransferLocalToRemote"));
+		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStore.class, "testSuperTransferDStoreWindowsAndDStore"));
 		return suite;
 	}
 	
@@ -117,7 +124,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, false);
 
 		IHost dstoreHost = getRemoteSystemConnection(SYSTEM_TYPE_ID, SYSTEM_ADDRESS, SYSTEM_NAME, USER_ID, PASSWORD);
-		assertTrue(dstoreHost != null);
+		assertNotNull(dstoreHost);
 		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
 		ISubSystem[] ss = sr.getServiceSubSystems(dstoreHost, IFileService.class);
 		for (int i=0; i<ss.length; i++) {
@@ -140,7 +147,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		{
 			IConnectorService connectionService = fss.getConnectorService();
 			//If you want to change the daemon to another port, uncomment following statements
-			
+			/*
 			IServerLauncherProperties properties = connectionService.getRemoteServerLauncherProperties();
 			
 			if (properties instanceof IRemoteServerLauncher)
@@ -149,10 +156,10 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 				sl.setDaemonPort(8008);
 				
 			}
-			
+			*/
 			
 			//If you want to connect to a running server, uncomment the following statements
-			/*
+			
 			IServerLauncherProperties properties = connectionService.getRemoteServerLauncherProperties();
 			
 			if (properties instanceof IRemoteServerLauncher)
@@ -161,7 +168,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 				sl.setServerLaunchType(ServerLaunchType.get(ServerLaunchType.RUNNING));
 				fss.getSubSystemConfiguration().updateSubSystem(fss, false, "xuanchen", true, 4033);
 			}
-			*/
+			
 
 			connectionService.connect(mon);
 			 
@@ -326,7 +333,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//now, copy META_INF into the folder in the remote system
 		IRemoteFile META_INF_folder = localFss.getRemoteFileObject(tempPath + '\\' + tarSourceFolderName1, mon);
-		assertTrue(META_INF_folder != null);
+		assertNotNull(META_INF_folder);
 		ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) META_INF_folder).getAdapter(ISystemDragDropAdapter.class);
 		SystemRemoteResourceSet fromSet = new SystemRemoteResourceSet(localFss, srcAdapter1);
 		fromSet.addResource(META_INF_folder);
@@ -335,7 +342,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//now, copy org into the folder in the remote system
 		IRemoteFile org_folder = localFss.getRemoteFileObject(tempPath + '\\' + tarSourceFolderName2, mon);
-		assertTrue(org_folder != null);
+		assertNotNull(org_folder);
 		ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) org_folder).getAdapter(ISystemDragDropAdapter.class);
 		SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(localFss, srcAdapter2);
 		fromSet2.addResource(org_folder);
@@ -344,9 +351,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//now, create tar file in the host
 		IRemoteFile tarSource = createFileOrFolder(tempDir.getAbsolutePath(), tarSourceFileName1, false);
-		assertTrue(tarSource != null);
+		assertNotNull(tarSource);
 		IRemoteFile tarSourceFolder1 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName1); 
-		assertTrue(tarSourceFolder1 != null);
+		assertNotNull(tarSourceFolder1);
 		IRemoteFile tarSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName2);
 		fss.copy(tarSourceFolder1, tarSource, tarSourceFolderName1, mon);
 		fss.copy(tarSourceFolder2, tarSource, tarSourceFolderName2, mon);
@@ -358,7 +365,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Create the zip file first.
 		String testName = "dummy.tar";
 		IRemoteFile newArchiveFile = createFileOrFolder(tempDirPath, testName, false);
-		assertTrue(newArchiveFile != null);
+		assertNotNull(newArchiveFile);
 		assertTrue(newArchiveFile.exists());
 		assertTrue(newArchiveFile.canRead());
 		assertTrue(newArchiveFile.canWrite());
@@ -370,16 +377,16 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Now, we want to create a text file inside.
 		String childName = "aaa.txt";
 		IRemoteFile file1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file1 != null);
+		assertNotNull(file1);
 		
 		childName = "bbb.txt";
 		IRemoteFile file2 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file2 != null);
+		assertNotNull(file2);
 		
 		//Create a folder
 		childName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, check the contents
 		String[] namesToCheck = {"aaa.txt", "bbb.txt", "folder1"};
@@ -389,15 +396,15 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Now, create some files inside the folder.
 		String secondLevelChildName = "ccc.exe";
 		IRemoteFile levelTwoChild1 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild1 != null);
+		assertNotNull(levelTwoChild1);
 		
 		secondLevelChildName = "ddd.bat";
 		IRemoteFile levelTwoChild2 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild2 != null);
+		assertNotNull(levelTwoChild2);
 		
 		secondLevelChildName = "another Folder"; //folder with space
 		IRemoteFile levelTwoChild3 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, true);
-		assertTrue(levelTwoChild3 != null);
+		assertNotNull(levelTwoChild3);
 		
 		//Now, check the contents
 		String[] namesToCheck1 = {"ccc.exe", "ddd.bat", "another Folder"};
@@ -414,18 +421,18 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
 		fss.copy(sourceFolder, targetTarFile, sourceFolder.getName(), mon);
 		
 		Object theCopiedChild = getChildFromFolder(targetTarFile, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -443,22 +450,22 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and copy the folder to there.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		
 		fss.copy(sourceFolder, firstLevelChild, sourceFolder.getName(), mon);
 		
 		Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -475,27 +482,27 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Get one of its fourth level children, and copy the folder to there.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-		assertTrue(secondLevelChild != null);
+		assertNotNull(secondLevelChild);
 		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-		assertTrue(thirdLevelChild != null);
+		assertNotNull(thirdLevelChild);
 		IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-		assertTrue(fourLevelChild != null);
+		assertNotNull(fourLevelChild);
 		
 		//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
 		fss.copy(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
 		
 		Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -511,21 +518,21 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Get one of its fourth level children, and copy the folder to there.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		
 		fss.copy(firstLevelChild, folder1, tarSourceFolderName1, mon);
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, tarSourceFolderName1);
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"MANIFEST.MF"};
 		int[] typesToCheck = {TYPE_FILE};
@@ -540,31 +547,31 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the level four folder from the zip file into folder1
 		//The folder is org/eclipse/dstore/core
 		//then, get directory "java" under org/eclipse/dstore/core
 		String parentForDirectoryToCopyName ="org";
 		IRemoteFile parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(sourceTarFile, parentForDirectoryToCopyName);
-		assertTrue(parentForDirectoryToCopy != null);
+		assertNotNull(parentForDirectoryToCopy);
 		
 		parentForDirectoryToCopyName ="eclipse";
 		parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
-		assertTrue(parentForDirectoryToCopy != null);
+		assertNotNull(parentForDirectoryToCopy);
 		
 		parentForDirectoryToCopyName ="dstore";
 		parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
-		assertTrue(parentForDirectoryToCopy != null);
+		assertNotNull(parentForDirectoryToCopy);
 		
 		String directoryToCopyName ="core";
 		IRemoteFile directoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, directoryToCopyName);
-		assertTrue(directoryToCopy != null);
+		assertNotNull(directoryToCopy);
 		
 		
 		//copy this level four children into folder1
@@ -572,7 +579,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, directoryToCopyName);
 		
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"client", "java", "miners", "model", "server", "util", "Activator.java"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
@@ -620,11 +627,11 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into a first level virtual file in targetZipFile
 		//Get one of its first level children, and copy the folder to there.
@@ -635,7 +642,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		Object theMovedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
 		
-		assertTrue(theMovedChild != null);
+		assertNotNull(theMovedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -644,7 +651,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//make sure the original folder is gone.
 		Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
-		assertFalse(originalSource != null);
+		assertNull(originalSource);
 	}
 
 	public void testMoveToVirtualFileLevelFour() throws Exception {
@@ -656,28 +663,28 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Get one of its fourth level children, and copy the folder to there.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-		assertTrue(secondLevelChild != null);
+		assertNotNull(secondLevelChild);
 		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-		assertTrue(thirdLevelChild != null);
+		assertNotNull(thirdLevelChild);
 		IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-		assertTrue(fourLevelChild != null);
+		assertNotNull(fourLevelChild);
 		
 		//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
 		fss.move(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
 		
 		Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the moved child has the right contents.
 		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
@@ -686,7 +693,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//make sure the original folder is gone.
 		Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
-		assertFalse(originalSource != null);
+		assertNull(originalSource);
 	}
 
 	public void testMoveTarVirtualFile() throws Exception {
@@ -697,23 +704,23 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//then, create a folder inside the tempDir
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, copy one of the folder from the zip file into folder1
 		String movedFolderName = tarSourceFolderName1;
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		fss.move(firstLevelChild, folder1, movedFolderName, mon);
 		
 		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
 		
-		assertTrue(movedVirtualFolder != null);
+		assertNotNull(movedVirtualFolder);
 		
 		String[] contents = {"MANIFEST.MF"};
 		int[] typesToCheck = {TYPE_FILE};
@@ -721,7 +728,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//Now, make sure the moved virtual folder is gone from its original zip file
 		IRemoteFile tmp = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-		assertTrue(tmp == null);
+		assertNull(tmp);
 	}
 
 	public void testMoveTarVirtualFileLevelFour() throws Exception {
@@ -732,22 +739,22 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Get one of its fourth level children, and move it to the folder
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-		assertTrue(secondLevelChild != null);
+		assertNotNull(secondLevelChild);
 		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-		assertTrue(thirdLevelChild != null);
+		assertNotNull(thirdLevelChild);
 		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-		assertTrue(fourthLevelChild != null);
+		assertNotNull(fourthLevelChild);
 		String movedFolderName = fourthLevelChild.getName();
 		
 		//copy this level four children into folder1
@@ -755,7 +762,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		Object copiedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
 		
-		assertTrue(copiedVirtualFolder != null);
+		assertNotNull(copiedVirtualFolder);
 		
 		String[] contents = {"client", "java", "miners", "model", "server", "util", "Activator.java"};
 		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
@@ -764,7 +771,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Now, make sure the moved virtual folder is gone from its original zip file
 		//children = fss.resolveFilterString(sourceTarFile, null, mon);
 		Object result = getChildFromFolder(thirdLevelChild, movedFolderName);
-		assertTrue(result == null);  //we should not be able to find it.
+		assertNull(result);  //we should not be able to find it.
 	}
 
 	public void testRenameTarVirtualFile() throws Exception {
@@ -777,16 +784,16 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Now, we want to create a text file inside.
 		String childName = "aaa.txt";
 		IRemoteFile file1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file1 != null);
+		assertNotNull(file1);
 		
 		childName = "bbb.txt";
 		IRemoteFile file2 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, false);
-		assertTrue(file2 != null);
+		assertNotNull(file2);
 		
 		//Create a folder
 		childName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(newArchiveFile.getAbsolutePath(), childName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Now, check the contents
 		String[] levelOneNamesToCheck = {"aaa.txt", "bbb.txt", "folder1"};
@@ -796,15 +803,15 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Now, create some files inside the folder.
 		String secondLevelChildName = "ccc.exe";
 		IRemoteFile levelTwoChild1 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild1 != null);
+		assertNotNull(levelTwoChild1);
 		
 		secondLevelChildName = "ddd.bat";
 		IRemoteFile levelTwoChild2 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, false);
-		assertTrue(levelTwoChild2 != null);
+		assertNotNull(levelTwoChild2);
 		
 		secondLevelChildName = "another Folder"; //folder with space
 		IRemoteFile levelTwoChild3 = createFileOrFolder(folder1.getAbsolutePath(), secondLevelChildName, true);
-		assertTrue(levelTwoChild3 != null);
+		assertNotNull(levelTwoChild3);
 		
 		//Now, check the contents
 		String[] levelTwoNamesToCheck = {"ccc.exe", "ddd.bat", "another Folder"};
@@ -843,36 +850,36 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//delete a file from level 2
 		String parentForFileToDeleteName ="META-INF";
 		IRemoteFile parentForFileToDelete = (IRemoteFile)getChildFromFolder(sourceTarFile, parentForFileToDeleteName);
-		assertTrue(parentForFileToDelete != null);
+		assertNotNull(parentForFileToDelete);
 		String deleteFileName = "MANIFEST.MF";
 		IRemoteFile fileToToDelete = (IRemoteFile)getChildFromFolder(parentForFileToDelete, deleteFileName);
-		assertTrue(fileToToDelete != null);
+		assertNotNull(fileToToDelete);
 		//Now, delete this file
 		fss.delete(fileToToDelete, mon);
 		fileToToDelete = (IRemoteFile)getChildFromFolder(parentForFileToDelete, deleteFileName);
-		assertTrue(fileToToDelete == null);
+		assertNull(fileToToDelete);
 		
 		//then, get directory "java" under org/eclipse/dstore/core
 		String parentForDirectoryToDeleteName ="org";
 		IRemoteFile parentForDirectoryToDelete = (IRemoteFile)getChildFromFolder(sourceTarFile, parentForDirectoryToDeleteName);
-		assertTrue(parentForDirectoryToDelete != null);
+		assertNotNull(parentForDirectoryToDelete);
 		
 		parentForDirectoryToDeleteName ="eclipse";
 		parentForDirectoryToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, parentForDirectoryToDeleteName);
-		assertTrue(parentForDirectoryToDelete != null);
+		assertNotNull(parentForDirectoryToDelete);
 		
 		parentForDirectoryToDeleteName ="dstore";
 		parentForDirectoryToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, parentForDirectoryToDeleteName);
-		assertTrue(parentForDirectoryToDelete != null);
+		assertNotNull(parentForDirectoryToDelete);
 		
 		parentForDirectoryToDeleteName ="core";
 		parentForDirectoryToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, parentForDirectoryToDeleteName);
-		assertTrue(parentForDirectoryToDelete != null);
+		assertNotNull(parentForDirectoryToDelete);
 		
 		String directoryToDeleteName = "java";
 		IRemoteFile directoryToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, directoryToDeleteName);
@@ -887,13 +894,13 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//And check this directory is not there any more.
 		directoryToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, directoryToDeleteName);
-		assertTrue(directoryToDelete == null);
+		assertNull(directoryToDelete);
 		
 		//Now, delete some files and folder inside the a virtual folder.
 		parentForFileToDelete = (IRemoteFile)getChildFromFolder(parentForDirectoryToDelete, "model");
 		deleteFileName = "DE.java";
 		fileToToDelete = (IRemoteFile)getChildFromFolder(parentForFileToDelete, deleteFileName);
-		assertTrue(fileToToDelete != null);
+		assertNotNull(fileToToDelete);
 		
 		fss.delete(fileToToDelete, mon);
 		
@@ -913,12 +920,12 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		//Now, copy the source folder.
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir,sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
 		IRemoteFile[] sourceFiles = new IRemoteFile[3];
@@ -934,7 +941,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Checking the first copied folder
 		Object theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName1);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
@@ -945,7 +952,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Checking the second copied folder
 		theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName2);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck2 = {"features"};
@@ -955,7 +962,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//Checking the third copied file
 		theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName3);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
@@ -969,22 +976,22 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String tarTargetFileName = tarSourceFileName1;
 		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
+		assertNotNull(targetTarFile);
 		
 		//Now, copy the source folder.
 		String sourceFolderName = folderToCopyName3;
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
+		assertNotNull(sourceFolder);
 		
 		//Get one of its fourth level children, and copy the folder to there.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-		assertTrue(secondLevelChild != null);
+		assertNotNull(secondLevelChild);
 		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-		assertTrue(thirdLevelChild != null);
+		assertNotNull(thirdLevelChild);
 		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-		assertTrue(fourthLevelChild != null);
+		assertNotNull(fourthLevelChild);
 		
 		IRemoteFile[] sourceFiles = new IRemoteFile[3];
 		//Also add some of its children into the batch.
@@ -1000,7 +1007,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Checking the first copied folder
 		Object theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName1);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
@@ -1011,7 +1018,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Checking the second copied folder
 		theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName2);
 		
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		
 		//Also make sure the copied child has the right contents.
 		String[] childrenToCheck2 = {"features"};
@@ -1021,7 +1028,7 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		//Checking the third copied file
 		theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName3);
-		assertTrue(theCopiedChild != null);
+		assertNotNull(theCopiedChild);
 		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
@@ -1034,52 +1041,142 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		
 		String sourceFileName = tarSourceFileName1;
 		IRemoteFile sourceTarFile = (IRemoteFile)getChildFromFolder(tempDir, sourceFileName);
-		assertTrue(sourceTarFile != null);
+		assertNotNull(sourceTarFile);
 		
 		//then, create a folder inside the tempDir
 		String folderName = "folder1";
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
-		assertTrue(folder1 != null);
+		assertNotNull(folder1);
 		
 		//Get several of its fifth level children, and them into the folder.
 		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
-		assertTrue(firstLevelChild != null);
+		assertNotNull(firstLevelChild);
 		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-		assertTrue(secondLevelChild != null);
+		assertNotNull(secondLevelChild);
 		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-		assertTrue(thirdLevelChild != null);
+		assertNotNull(thirdLevelChild);
 		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-		assertTrue(fourthLevelChild != null);
+		assertNotNull(fourthLevelChild);
 		
 		IRemoteFile[] fifLevelChildrenToCopy = new IRemoteFile[3];
 		
 		String firstToCopyName = "client"; 
 		fifLevelChildrenToCopy[0] = (IRemoteFile)getChildFromFolder(fourthLevelChild, firstToCopyName);
-		assertTrue(fifLevelChildrenToCopy[0] != null);
+		assertNotNull(fifLevelChildrenToCopy[0]);
 		String secondToCopyName = "miners"; 
 		fifLevelChildrenToCopy[1] = (IRemoteFile)getChildFromFolder(fourthLevelChild, secondToCopyName);
-		assertTrue(fifLevelChildrenToCopy[1] != null);
+		assertNotNull(fifLevelChildrenToCopy[1]);
 		String thirdToCopyName = "Activator.java"; 
 		fifLevelChildrenToCopy[2] = (IRemoteFile)getChildFromFolder(fourthLevelChild, thirdToCopyName);
-		assertTrue(fifLevelChildrenToCopy[2] != null);
+		assertNotNull(fifLevelChildrenToCopy[2]);
 		
 		
 		fss.copyBatch(fifLevelChildrenToCopy, folder1, mon);
 		
 		Object copiedVirtualFolder1 = getChildFromFolder(folder1, firstToCopyName);
-		assertTrue(copiedVirtualFolder1 != null);
+		assertNotNull(copiedVirtualFolder1);
 		String[] contents1 = {"ClientConnection.java", "ConnectionStatus.java"};
 		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE};
 		checkFolderContents((IRemoteFile)copiedVirtualFolder1, contents1, typesToCheck1);
 		
 		Object copiedVirtualFolder2 = getChildFromFolder(folder1, secondToCopyName);
-		assertTrue(copiedVirtualFolder2 != null);
+		assertNotNull(copiedVirtualFolder2);
 		String[] contents2 = {"Miner.java", "MinerThread.java"};
 		int[] typesToCheck2 = {TYPE_FILE, TYPE_FILE};
 		checkFolderContents((IRemoteFile)copiedVirtualFolder2, contents2, typesToCheck2);
 		
 		Object copiedVirtualFolder3 = getChildFromFolder(folder1, thirdToCopyName);
-		assertTrue(copiedVirtualFolder3 != null);
+		assertNotNull(copiedVirtualFolder3);
+	}
+	
+	
+	public void testSuperTransferDStoreWindowsAndDStore() throws Exception {
+		String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
+		IFileStore temp = createDir(tempPath, true);
+		
+		createSuperTransferFolder(temp);
+		
+		//Set the superTransfer preference on
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		boolean preference_DOSUPERTRANSFER = store.getBoolean(ISystemFilePreferencesConstants.DOSUPERTRANSFER);
+		store.setValue(ISystemFilePreferencesConstants.DOSUPERTRANSFER, true);
+		
+		//now, copy folderToCopy into the folder in the remote system
+		IRemoteFile sourceFolderToCopy1 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName3, mon);
+		ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy1).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet1 = new SystemRemoteResourceSet(localFss, srcAdapter1);
+		fromSet1.addResource(sourceFolderToCopy1);
+		ISystemResourceSet tempObjects1 = srcAdapter1.doDrag(fromSet1, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects1, tempDir, mon, true);
+		
+		//Then, we need to retrieve children of the tempDir to cache their information.
+		fss.resolveFilterString(tempDir, null, mon);
+		
+		//Now, we need to have a Windows DStore connection, so that we could use super transfer to copy
+		//directory from DStore Unix/Linux to DStore Windows
+		//We need to delay if it is first case run after a workspace startup
+		String systemTypeID = IRSESystemType.SYSTEMTYPE_WINDOWS_ID;
+		String systemAddress = "LOCALHOST";
+		String systemName = "LOCALHOST_ds";
+		
+
+		IHost dstoreHost = getRemoteSystemConnection(systemTypeID, systemAddress, systemName, "", "");
+		assertNotNull(dstoreHost);
+		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
+		ISubSystem[] ss = sr.getServiceSubSystems(dstoreHost, IFileService.class);
+		IFileServiceSubSystem dstoreWindowsFss = null;
+		for (int i=0; i<ss.length; i++) {
+			if (ss[i] instanceof IFileServiceSubSystem) {
+				dstoreWindowsFss = (IFileServiceSubSystem)ss[i];
+			}
+		}
+		assertNotNull(dstoreWindowsFss);
+		IConnectorService dstoreWindowsConnectionService = dstoreWindowsFss.getConnectorService();
+		dstoreWindowsConnectionService.connect(mon);
+		
+		//Then, create a temparory directory the My Home of the DStore Windows
+		//Create a temparory directory in My Home
+		IRemoteFile dstoreWindowsTempDir = null;
+		//String dstoreWindowsTempDirPath = null;
+		try
+		{
+			IRemoteFile homeDirectory = dstoreWindowsFss.getRemoteFileObject(".", mon);
+			String baseFolderName = "rsetest";
+			String homeFolderName = homeDirectory.getAbsolutePath();
+			String testFolderName = FileServiceHelper.getRandomLocation(dstoreWindowsFss, homeFolderName, baseFolderName, mon);
+			dstoreWindowsTempDir = createFileOrFolder(dstoreWindowsFss, homeFolderName, testFolderName, true);
+		}
+		catch (Exception e)
+		{
+			fail("Problem encountered: " + e.getStackTrace().toString());
+		}
+		
+		//now, copy that folder in the Dstore connection into the folder in DStore Windows connection
+		IRemoteFile sourceFolderToCopy2 = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName3);
+		ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy2).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(fss, srcAdapter2);
+		fromSet2.addResource(sourceFolderToCopy2);
+		ISystemResourceSet tempObjects2 = srcAdapter2.doDrag(fromSet2, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, dstoreWindowsTempDir, mon, true);
+		
+		Object[] children = dstoreWindowsFss.resolveFilterString(dstoreWindowsTempDir, null, mon);
+		//Make sure there is no temp archive file left 
+		assertTrue(children.length == 1);
+		
+		//then verify the result of copy
+		Object theCopiedFolder = getChildFromFolder(dstoreWindowsFss, dstoreWindowsTempDir, folderToCopyName3);
+		assertNotNull(theCopiedFolder);
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck = {"aaaaaaaa", "aaaab", "epdcdump01.hex12a", "RSE-SDK-2.0RC1.zip"};
+		
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
+		checkFolderContents(dstoreWindowsFss, (IRemoteFile)theCopiedFolder, childrenToCheck, typesToCheck);
+		
+		//Then, set the preference back to its original value
+		store.setValue(ISystemFilePreferencesConstants.DOSUPERTRANSFER, preference_DOSUPERTRANSFER);
+		
+		//Then, delete the temp folder in the junit workspace.
+		temp.delete(EFS.NONE, mon);
 	}
 
 }
diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStoreWindows.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStoreWindows.java
index 5ccb1481648..481a0b68d62 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStoreWindows.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceArchiveTestDStoreWindows.java
@@ -19,7 +19,6 @@ import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.core.subsystems.IConnectorService;
 import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.files.IFileService;
 import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
 import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
@@ -32,7 +31,9 @@ public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest
 	private boolean fPreference_ALERT_NONSSL;
 
 	public static junit.framework.Test suite() {
+		
 		TestSuite suite = new TestSuite("FileServiceArchiveTestDStoreWindows");
+		
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testCopyBatchToArchiveFile")); //$NON-NLS-1$
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testCopyBatchToVirtualFileLevelOne")); //$NON-NLS-1$
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testCopyBatchToVirtualFileLevelTwo")); //$NON-NLS-1$
@@ -55,6 +56,9 @@ public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testMoveVirtualFileLevelTwo")); //$NON-NLS-1$
 		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testRenameVirtualFile")); //$NON-NLS-1$
 		//suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testRenameVirtualFileBigZip")); //$NON-NLS-1$
+		
+		suite.addTest(TestSuite.createTest(FileServiceArchiveTestDStoreWindows.class, "testSuperTransferLocalToRemote"));
+		 
 		return suite;
 	}
 	
@@ -152,5 +156,7 @@ public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest
 		store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, fPreference_ALERT_NONSSL);
 		super.tearDown();
 	}
+	
+
 
 }
diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java
index f193fc83e78..25d69a1a47e 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceBaseTest.java
@@ -122,34 +122,43 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
 	}
 	
 	public IRemoteFile createFileOrFolder(String targetFolderName, String fileOrFolderName, boolean isFolder) throws Exception
+	{
+		return createFileOrFolder(fss, targetFolderName, fileOrFolderName, isFolder);
+	}
+	
+	public IRemoteFile createFileOrFolder(IFileServiceSubSystem inputFss, String targetFolderName, String fileOrFolderName, boolean isFolder) throws Exception
 	{
 		IRemoteFile result = null;
 		System.out.println("createFileOrFolder: targetFolderName is " + targetFolderName);
-		IRemoteFile targetFolder = fss.getRemoteFileObject(targetFolderName, mon);
-		//fss.resolveFilterString(targetFolder, null, mon);
+		IRemoteFile targetFolder = inputFss.getRemoteFileObject(targetFolderName, mon);
 		String fileOrFolderAbsName = getNewAbsoluteName(targetFolder, fileOrFolderName);
-		IRemoteFile newFileOrFolderPath = fss.getRemoteFileObject(fileOrFolderAbsName, mon); 
+		IRemoteFile newFileOrFolderPath = inputFss.getRemoteFileObject(fileOrFolderAbsName, mon); 
 		if (isFolder)
 		{
-			result = fss.createFolder(newFileOrFolderPath, mon);
+			result = inputFss.createFolder(newFileOrFolderPath, mon);
 		}
 		else
 		{
-			result = fss.createFile(newFileOrFolderPath, mon);
+			result = inputFss.createFile(newFileOrFolderPath, mon);
 		}
 		//Need to call resolveFilterString of the parent to make sure the newly created child
 		//is added to the DStore map.  Otherwise, next time when query it, it will just created a 
 		//default filter string.  And the dstore server cannot handler it correctly.
-		fss.resolveFilterString(targetFolder, null, mon);
+		inputFss.resolveFilterString(targetFolder, null, mon);
 		return result;
 	}
 	
 	public Object getChildFromFolder(IRemoteFile folderToCheck, String childName) throws Exception
+	{
+		return getChildFromFolder(fss, folderToCheck, childName);
+	}
+	
+	public Object getChildFromFolder(IFileServiceSubSystem inputFss, IRemoteFile folderToCheck, String childName) throws Exception
 	{
 		//then check the result of copy
 		Object[] children = null;
 		Object foundChild = null;
-		children = fss.resolveFilterString(folderToCheck, null, mon);
+		children = inputFss.resolveFilterString(folderToCheck, null, mon);
 		for (int i=0; i<children.length; i++)
 		{
 			String thisName = ((IRemoteFile)children[i]).getName();
@@ -162,13 +171,18 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
 	}
 	
 	public void checkFolderContents(IRemoteFile folderToCheck, String[] names, int[] types) throws Exception
+	{
+		checkFolderContents(fss, folderToCheck, names, types);
+	}
+	
+	public void checkFolderContents(IFileServiceSubSystem inputFss, IRemoteFile folderToCheck, String[] names, int[] types) throws Exception
 	{
 		//the folder returned by the create API did not get the right attributes.
 		//We need to call getRemoteFileObject to get its attribute updated.
 		//Otherwise, will get error "directory not readable"
-		folderToCheck = fss.getRemoteFileObject(folderToCheck.getAbsolutePath(), mon);
+		folderToCheck = inputFss.getRemoteFileObject(folderToCheck.getAbsolutePath(), mon);
 		System.out.println("verifying the contents for folder: " + folderToCheck.getAbsolutePath());
-		Object[] children = fss.resolveFilterString(folderToCheck, null, mon);
+		Object[] children = inputFss.resolveFilterString(folderToCheck, null, mon);
 		//Make sure the children array includes the copied folder.
 		HashMap childrenMap = new HashMap();
 	    //Add children name into the map