diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/RSECoreTestCase.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/RSECoreTestCase.java
index a44686121b3..3497056c206 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/RSECoreTestCase.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/core/RSECoreTestCase.java
@@ -43,6 +43,8 @@ import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.persistence.IRSEPersistenceManager;
 import org.eclipse.rse.tests.RSETestsPlugin;
 import org.eclipse.rse.tests.core.RSEWaitAndDispatchUtil.IInterruptCondition;
 import org.eclipse.rse.ui.SystemBasePlugin;
@@ -346,16 +348,66 @@ public class RSECoreTestCase extends TestCase {
 		}
 	}
 	
+	/**
+	 * Wait until the SystemProfileManager has finished loading all "autoload" profiles,
+	 * and the RSEUIPlugin InitRSEJob has finished filling it with the default connections.
+	 * @throws InterruptedException
+	 */
+	protected void waitForRSEWorkspaceInit() throws InterruptedException {
+		//RSEUIPlugin is loaded automatically because RSETestsPlugins extends SystemBasePlugin,
+		//which is defined in org.eclipse.rse.ui, so we KNOW org.eclipse.rse.ui is started.
+		//TODO: At one point we want the tests to run headless, so then RSETestsPlugins should
+		//not extend SystemBasePlugin any more.
+		Job[] jobs = Job.getJobManager().find(null);
+		for(int i=0; i<jobs.length; i++) {
+			if ("Initialize RSE".equals(jobs[i].getName())) { //$NON-NLS-1$
+				System.out.println("Waiting for InitRSEJob"); //$NON-NLS-1$
+				jobs[i].join();
+				break;
+			}
+		}
+		//The code below would never be necessary during normal initialization,
+		//Since the InitRSEJob takes care of loading the profiles already.
+		//We still wait here, in order to ensure that unit tests are really
+		//separate from each other.
+		final IRSEPersistenceManager pm = RSECorePlugin.getThePersistenceManager();
+		while (!pm.isRestoreComplete() || pm.isBusy()) {
+			System.err.println("Waiting for Persistence Manager"); //$NON-NLS-1$
+			Thread.sleep(100);
+		}
+	}
+
 	/* (non-Javadoc)
 	 * @see junit.framework.TestCase#setUp()
 	 */
 	protected void setUp() throws Exception {
 		super.setUp();
-		
+		waitForRSEWorkspaceInit();
+		switchMaximizeSystemsView();
+	}
+
+	/* (non-Javadoc)
+	 * @see junit.framework.TestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		restoreMaximizeSystemsView();
+		super.tearDown();
+	}
+	
+	// ***** View and perspective management and support methods *****	
+
+	/**
+	 * Bring the RSE SystemsView to front, and toggle its "maximized" state based on what
+	 * the {@link IRSECoreTestCaseProperties#PROP_MAXIMIZE_REMOTE_SYSTEMS_VIEW} property
+	 * requires for the given test case.
+	 * In case a Workbench Intro View is hiding every else because this is the first
+	 * product launch, it is hidden.
+	 */
+	protected void switchMaximizeSystemsView() {
 		final String perspectiveId = getProperty(IRSECoreTestCaseProperties.PROP_SWITCH_TO_PERSPECTIVE);
 		assertNotNull("Invalid null-value for test case perspective id!", perspectiveId); //$NON-NLS-1$
 		
-		// all view managment must happen in the UI thread!
+		// all view management must happen in the UI thread!
 		PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
 			public void run() {
 				// in case the test case is launched within a new workspace, the eclipse intro
@@ -382,19 +434,23 @@ public class RSECoreTestCase extends TestCase {
 		});
 		
 		// Give the UI a chance to repaint if the view zoom state changed
-		if (isProperty(PROP_RSE_SYSTEMS_VIEW_ZOOM_STATE_CHANGED, true)) RSEWaitAndDispatchUtil.waitAndDispatch(1000);
+		if (isProperty(PROP_RSE_SYSTEMS_VIEW_ZOOM_STATE_CHANGED, true)) {
+			System.err.println("Waiting for UI to repaint"); //$NON-NLS-1$
+			RSEWaitAndDispatchUtil.waitAndDispatch(1000);
+		}
 	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
+	
+	/**
+	 * Restore the RSE SystemsView to its previous state, in case the view state
+	 * has been changed by {@link #switchMaximizeSystemsView()}. 
 	 */
-	protected void tearDown() throws Exception {
+	protected void restoreMaximizeSystemsView() {
 		// restore the original view zoom state
 		if (isProperty(PROP_RSE_SYSTEMS_VIEW_ZOOM_STATE_CHANGED, true)) {
 			final String perspectiveId = getProperty(IRSECoreTestCaseProperties.PROP_SWITCH_TO_PERSPECTIVE);
 			assertNotNull("Invalid null-value for test case perspective id!", perspectiveId); //$NON-NLS-1$
 
-			// all view managment must happen in the UI thread!
+			// all view management must happen in the UI thread!
 			PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() {
 				public void run() {
 					IViewReference reference = findView(IRSEViews.RSE_REMOTE_SYSTEMS_VIEW_ID, perspectiveId);
@@ -410,12 +466,8 @@ public class RSECoreTestCase extends TestCase {
 				}
 			});
 		}
-		
-		super.tearDown();
 	}
 	
-	// ***** View and perspective management and support methods *****	
-
 	/**
 	 * Finds the view reference for the view identified by the specified id.
 	 * 
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 2218f7782ad..e7820dafe0d 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
@@ -16,18 +16,11 @@ import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
 import org.eclipse.rse.core.model.ISystemResourceSet;
 import org.eclipse.rse.core.model.SystemRemoteResourceSet;
-import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.core.model.SystemWorkspaceResourceSet;
-import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISystemDragDropAdapter;
 import org.eclipse.rse.files.ui.resources.UniversalFileTransferUtility;
-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;
 import org.eclipse.rse.tests.RSETestsPlugin;
 
@@ -51,370 +44,297 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		return ResourcesPlugin.getWorkspace();
 	}
 	
-	
-	public void createSourceFolders()
+	public void createSourceFolders() throws Exception
 	{
-		try
-		{
-			String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
-			IFileStore temp = createDir(tempPath, true);
-			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);
-			
-			//now, copy folderToCopy into the folder in the remote system
-			IRemoteFile sourceFolderToCopy3 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName3, mon);
-			ISystemDragDropAdapter srcAdapter3 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy3).getAdapter(ISystemDragDropAdapter.class);
-			SystemRemoteResourceSet fromSet3 = new SystemRemoteResourceSet(localFss, srcAdapter3);
-			fromSet3.addResource(sourceFolderToCopy3);
-			ISystemResourceSet tempObjects3 = srcAdapter3.doDrag(fromSet3, mon);
-			UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects3, tempDir, mon, true);
-			
-			//Then, we need to retrieve children of the tempDir to cache their information.
-			fss.resolveFilterString(tempDir, null, mon);
-			
-			//Then, delete the temp folder in the junit workspace.
-			temp.delete(EFS.NONE, mon);
-			
-			return;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
+		String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
+		IFileStore temp = createDir(tempPath, true);
+		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);
+		
+		//now, copy folderToCopy into the folder in the remote system
+		IRemoteFile sourceFolderToCopy3 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName3, mon);
+		ISystemDragDropAdapter srcAdapter3 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy3).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet3 = new SystemRemoteResourceSet(localFss, srcAdapter3);
+		fromSet3.addResource(sourceFolderToCopy3);
+		ISystemResourceSet tempObjects3 = srcAdapter3.doDrag(fromSet3, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects3, tempDir, mon, true);
+		
+		//Then, we need to retrieve children of the tempDir to cache their information.
+		fss.resolveFilterString(tempDir, null, mon);
+		
+		//Then, delete the temp folder in the junit workspace.
+		temp.delete(EFS.NONE, mon);
 	}
 	
-	public void createSourceZipFiles()
+	public void createSourceZipFiles() throws Exception
 	{
-		try
-		{
-			/* build scenario */
-			String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
-			IFileStore temp = createDir(tempPath, true);
-			String content = getRandomString();
-			
-			//Now, we need to construct a "closeBefore.zip" archive file
-			//We will construct the content of the zip file in folder "RemoteSystemsConnections"
-			//Then we copy this folder into a zip file by RSE API.
-			IFileStore RemoteSystemsConnections = temp.getChild(folderToCopyName1);
-			createDir(RemoteSystemsConnections, true);
-			//Now, populate the contents in the folderToCopy.
-			IFileStore Team = RemoteSystemsConnections.getChild("Team");
-			createDir(Team, true);
-			//create folder inside the Team folder.
-			IFileStore Connections = Team.getChild("Connections");
-			createDir(Connections, true);
-			IFileStore dummyFile = Connections.getChild("dummy.txt");
-			content = getRandomString();
-			createFile(dummyFile, content);
-			IFileStore Filters = Team.getChild("Filters");
-			createDir(Filters, true);
-			//Now, create a few folders inside the Filters folder.
-			IFileStore ibm_cmds = Filters.getChild("ibm.cmds");
-			createDir(ibm_cmds, true);
-			IFileStore ibm_cmds400 = Filters.getChild("ibm.cmds400");
-			createDir(ibm_cmds400, true);
-			//create another directory inside this one
-			IFileStore filter_pool1 = ibm_cmds400.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool1, true);
-			//create a file inside this folder
-			IFileStore filter_pool1_xml = filter_pool1.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool1_xml, content);
-			
-			IFileStore ibm_cmdsIFS = Filters.getChild("ibm.cmdsIFS");
-			createDir(ibm_cmdsIFS, true);
-			IFileStore ibm_cmdsLocal = Filters.getChild("ibm.cmdsLocal");
-			createDir(ibm_cmdsLocal, true);
-			
-			IFileStore ibm_files = Filters.getChild("ibm.files");
-			createDir(ibm_files, true);
-			//create another directory inside this one
-			IFileStore filter_pool2 = ibm_files.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool2, true);
-			//create a file inside this folder
-			IFileStore filter_pool2_xml = filter_pool2.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool2_xml, content);
-			
-			IFileStore ibm_files_aix = Filters.getChild("ibm.files.aix");
-			createDir(ibm_files_aix, true);
-			//create another directory inside this one
-			IFileStore filter_pool3 = ibm_files_aix.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool3, true);
-			//create a file inside this folder
-			IFileStore filter_pool3_xml = filter_pool3.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool3_xml, content);
-			
-			IFileStore ibm_iles_powerlinux = Filters.getChild("ibm.files.powerlinux");
-			createDir(ibm_iles_powerlinux, true);
-			//create another directory inside this one
-			IFileStore filter_pool4 = ibm_iles_powerlinux.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool4, true);
-			//create a file inside this folder
-			IFileStore filter_pool4_xml = filter_pool4.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool4_xml, content);
-			
-			IFileStore ibm_files400 = Filters.getChild("ibm.files400");
-			createDir(ibm_files400, true);
-			//create another directory inside this one
-			IFileStore filter_pool5 = ibm_files400.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool5, true);
-			//create a file inside this folder
-			IFileStore filter_pool5_xml = filter_pool5.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool5_xml, content);
-			
-			IFileStore ibm_filesLocal = Filters.getChild("ibm.filesLocal");
-			createDir(ibm_filesLocal, true);
-			//create another directory inside this one
-			IFileStore filter_pool6 = ibm_filesLocal.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool6, true);
-			//create a file inside this folder
-			IFileStore filter_pool6_xml = filter_pool6.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool6_xml, content);
-			
-			IFileStore ibm_filesIFS = Filters.getChild("ibm.filesIFS");
-			createDir(ibm_filesIFS, true);
-			//create another directory inside this one
-			IFileStore filter_pool7 = ibm_filesIFS.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool7, true);
-			//create a file inside this folder
-			IFileStore filter_pool7_xml = filter_pool7.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool7_xml, content);
-			
-			IFileStore ibm_filesWindows = Filters.getChild("ibm.filesWindows");
-			createDir(ibm_filesWindows, true);
-			//create another directory inside this one
-			IFileStore filter_pool8 = ibm_filesWindows.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool8, true);
-			//create a file inside this folder
-			IFileStore filter_pool8_xml = filter_pool8.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool8_xml, content);
-			
-			IFileStore ibm_jobs400 = Filters.getChild("ibm.jobs400");
-			createDir(ibm_jobs400, true);
-			//create another directory inside this one
-			IFileStore filter_pool9 = ibm_jobs400.getChild("FilterPool_Team Filter Pool");
-			createDir(filter_pool9, true);
-			//create a file inside this folder
-			IFileStore filter_pool9_xml = filter_pool9.getChild("filterPool_Team Filter Pool.xmi");
-			content = getRandomString();
-			createFile(filter_pool9_xml, content);
-			
-			//create file inside the Team folder.
-			IFileStore profile_xml = Team.getChild("profile.xmi");
-			content = getRandomString();
-			createFile(profile_xml, content);
-			
-			//Now create another folder TypeFilters in the RemoteSystemsConnections folder
-			IFileStore TypeFilters = RemoteSystemsConnections.getChild("TypeFilters");
-			createDir(TypeFilters, true);
-			dummyFile = TypeFilters.getChild("dummy.txt");
-			content = getRandomString();
-			createFile(dummyFile, content);
-			//Now create another folder xuanchentp in the RemoteSystemsConnections folder
-			IFileStore xuanchentp = RemoteSystemsConnections.getChild("xuanchentp");
-			createDir(xuanchentp, true);
-			//Create some files and folder inside the xuanchentp folder
-			IFileStore Connections1 = xuanchentp.getChild("Connections");
-			createDir(Connections1, true);
-			dummyFile = Connections1.getChild("dummy.txt");
-			content = getRandomString();
-			createFile(dummyFile, content);
-			IFileStore Filters1 = xuanchentp.getChild("Filters");
-			createDir(Filters1, true);
-			dummyFile = Filters1.getChild("dummy.txt");
-			content = getRandomString();
-			createFile(dummyFile, content);
-			IFileStore profile_xml1 = xuanchentp.getChild("profile.xmi");
-			content = getRandomString();
-			createFile(profile_xml1, content);
-			//now create two other files inside folder RemoteSystemConnections
-			IFileStore compatibility = RemoteSystemsConnections.getChild(".compatibility");
-			content = getRandomString();
-			createFile(compatibility, content);
-			IFileStore project = RemoteSystemsConnections.getChild(".project");
-			createFile(project, content);
-			
-			//Now, we need to create the content of mynewzip.zip file
-			IFileStore folder_6YLT5Xa = temp.getChild(folderToCopyName2);
-			createDir(folder_6YLT5Xa, true);
-			IFileStore folder_20070315a = folder_6YLT5Xa.getChild("20070315a");
-			createDir(folder_20070315a, true);
-			IFileStore QB5ROUTaadd = folder_20070315a.getChild("QB5ROUTaadd");
-			content = getRandomString();
-			createFile(QB5ROUTaadd, content);
-			IFileStore folder_20070319 = folder_6YLT5Xa.getChild("20070319");
-			createDir(folder_20070319, true);
-			content = getRandomString();
-			IFileStore QB5ROUTERa = folder_20070319.getChild("QB5ROUTERa");
-			content = getRandomString();
-			createFile(QB5ROUTERa, content);
-			IFileStore folder_20070320a = folder_6YLT5Xa.getChild("20070320a");
-			createDir(folder_20070320a, true);
-			IFileStore QB5ROupdfasd = folder_20070320a.getChild("QB5ROupdfasd");
-			content = getRandomString();
-			createFile(QB5ROupdfasd, content);
-			IFileStore folder_20070404a = folder_6YLT5Xa.getChild("20070404a");
-			createDir(folder_20070404a, true);
-			IFileStore qb5routeraad = folder_20070404a.getChild("qb5routeraad");
-			content = getRandomString();
-			createFile(qb5routeraad, content);
-			IFileStore dummyFolder = folder_6YLT5Xa.getChild("dummyFolder");
-			createDir(dummyFolder, true);
-			IFileStore folder_20070404a1 = dummyFolder.getChild("20070404a");
-			createDir(folder_20070404a1, true);
-			IFileStore qb5routeraa = folder_20070404a1.getChild("qb5routeraa");
-			content = getRandomString();
-			createFile(qb5routeraa, content);
-			IFileStore epdcdump01_hex12ab = dummyFolder.getChild("epdcdump01.hex12ab");
-			content = getRandomString();
-			createFile(epdcdump01_hex12ab, content);
-			
-			
-			
-			
-			//now, copy folderToCopy into the folder in the remote system
-			IRemoteFile sourceFolderToCopy1 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName1, mon);
-			ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy1).getAdapter(ISystemDragDropAdapter.class);
-			SystemRemoteResourceSet fromSet = new SystemRemoteResourceSet(localFss, srcAdapter1);
-			fromSet.addResource(sourceFolderToCopy1);
-			ISystemResourceSet tempObjects1 = srcAdapter1.doDrag(fromSet, mon);
-			UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects1, tempDir, mon, true);
-			
-			IRemoteFile sourceFolderToCopy2 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName2, mon);
-			ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy2).getAdapter(ISystemDragDropAdapter.class);
-			SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(localFss, srcAdapter2);
-			fromSet2.addResource(sourceFolderToCopy2);
-			ISystemResourceSet tempObjects2 = srcAdapter2.doDrag(fromSet2, mon);
-			UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, tempDir, mon, true);
-			
-			IRemoteFile zipSource1 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName1, false);
-			assertTrue(zipSource1 != null);
-			IRemoteFile zipSourceFolder = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName1);
-			fss.copy(zipSourceFolder, zipSource1, folderToCopyName1, mon);
-			
-			IRemoteFile zipSource2 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName2, false);
-			assertTrue(zipSource2 != null);
-			IRemoteFile zipSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName2);
-			fss.copy(zipSourceFolder2, zipSource2, folderToCopyName2, mon);
-			
-			//Then, we need to retrieve children of the tempDir to cache their information.
-			fss.resolveFilterString(tempDir, null, mon);
-			
-			//Then, delete the temp folder in the junit workspace.
-			temp.delete(EFS.NONE, mon);
-			
-			return;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
+		/* build scenario */
+		String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
+		IFileStore temp = createDir(tempPath, true);
+		String content = getRandomString();
 		
-	}
-	public void setUp() {
-		if (!classBeenRunBefore)
-		{
-			try
-			{
-				System.out.println("need to sleep");
-				Thread.sleep(500);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			classBeenRunBefore = true;
-		}
-		IHost localHost = getLocalSystemConnection();
-		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
-		ISubSystem[] ss = sr.getServiceSubSystems(localHost, IFileService.class);
-		for (int i=0; i<ss.length; i++) {
-			if (ss[i] instanceof IFileServiceSubSystem) {
-				fss = (IFileServiceSubSystem)ss[i];
-				fs = fss.getFileService();
-			}
-		}
-		localFss = fss;  //Used for creating test source data.
+		//Now, we need to construct a "closeBefore.zip" archive file
+		//We will construct the content of the zip file in folder "RemoteSystemsConnections"
+		//Then we copy this folder into a zip file by RSE API.
+		IFileStore RemoteSystemsConnections = temp.getChild(folderToCopyName1);
+		createDir(RemoteSystemsConnections, true);
+		//Now, populate the contents in the folderToCopy.
+		IFileStore Team = RemoteSystemsConnections.getChild("Team");
+		createDir(Team, true);
+		//create folder inside the Team folder.
+		IFileStore Connections = Team.getChild("Connections");
+		createDir(Connections, true);
+		IFileStore dummyFile = Connections.getChild("dummy.txt");
+		content = getRandomString();
+		createFile(dummyFile, content);
+		IFileStore Filters = Team.getChild("Filters");
+		createDir(Filters, true);
+		//Now, create a few folders inside the Filters folder.
+		IFileStore ibm_cmds = Filters.getChild("ibm.cmds");
+		createDir(ibm_cmds, true);
+		IFileStore ibm_cmds400 = Filters.getChild("ibm.cmds400");
+		createDir(ibm_cmds400, true);
+		//create another directory inside this one
+		IFileStore filter_pool1 = ibm_cmds400.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool1, true);
+		//create a file inside this folder
+		IFileStore filter_pool1_xml = filter_pool1.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool1_xml, content);
 		
-		//Create a temparory directory in My Home
-		try
-		{
-			IRemoteFile homeDirectory = fss.getRemoteFileObject(".", mon);
-			String baseFolderName = "rsetest";
-			String homeFolderName = homeDirectory.getAbsolutePath();
-			String testFolderName = FileServiceHelper.getRandomLocation(fss, homeFolderName, baseFolderName, mon);
-			tempDir = createFileOrFolder(homeFolderName, testFolderName, true);
-			tempDirPath = tempDir.getAbsolutePath();
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IFileStore ibm_cmdsIFS = Filters.getChild("ibm.cmdsIFS");
+		createDir(ibm_cmdsIFS, true);
+		IFileStore ibm_cmdsLocal = Filters.getChild("ibm.cmdsLocal");
+		createDir(ibm_cmdsLocal, true);
+		
+		IFileStore ibm_files = Filters.getChild("ibm.files");
+		createDir(ibm_files, true);
+		//create another directory inside this one
+		IFileStore filter_pool2 = ibm_files.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool2, true);
+		//create a file inside this folder
+		IFileStore filter_pool2_xml = filter_pool2.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool2_xml, content);
+		
+		IFileStore ibm_files_aix = Filters.getChild("ibm.files.aix");
+		createDir(ibm_files_aix, true);
+		//create another directory inside this one
+		IFileStore filter_pool3 = ibm_files_aix.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool3, true);
+		//create a file inside this folder
+		IFileStore filter_pool3_xml = filter_pool3.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool3_xml, content);
+		
+		IFileStore ibm_iles_powerlinux = Filters.getChild("ibm.files.powerlinux");
+		createDir(ibm_iles_powerlinux, true);
+		//create another directory inside this one
+		IFileStore filter_pool4 = ibm_iles_powerlinux.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool4, true);
+		//create a file inside this folder
+		IFileStore filter_pool4_xml = filter_pool4.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool4_xml, content);
+		
+		IFileStore ibm_files400 = Filters.getChild("ibm.files400");
+		createDir(ibm_files400, true);
+		//create another directory inside this one
+		IFileStore filter_pool5 = ibm_files400.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool5, true);
+		//create a file inside this folder
+		IFileStore filter_pool5_xml = filter_pool5.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool5_xml, content);
+		
+		IFileStore ibm_filesLocal = Filters.getChild("ibm.filesLocal");
+		createDir(ibm_filesLocal, true);
+		//create another directory inside this one
+		IFileStore filter_pool6 = ibm_filesLocal.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool6, true);
+		//create a file inside this folder
+		IFileStore filter_pool6_xml = filter_pool6.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool6_xml, content);
+		
+		IFileStore ibm_filesIFS = Filters.getChild("ibm.filesIFS");
+		createDir(ibm_filesIFS, true);
+		//create another directory inside this one
+		IFileStore filter_pool7 = ibm_filesIFS.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool7, true);
+		//create a file inside this folder
+		IFileStore filter_pool7_xml = filter_pool7.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool7_xml, content);
+		
+		IFileStore ibm_filesWindows = Filters.getChild("ibm.filesWindows");
+		createDir(ibm_filesWindows, true);
+		//create another directory inside this one
+		IFileStore filter_pool8 = ibm_filesWindows.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool8, true);
+		//create a file inside this folder
+		IFileStore filter_pool8_xml = filter_pool8.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool8_xml, content);
+		
+		IFileStore ibm_jobs400 = Filters.getChild("ibm.jobs400");
+		createDir(ibm_jobs400, true);
+		//create another directory inside this one
+		IFileStore filter_pool9 = ibm_jobs400.getChild("FilterPool_Team Filter Pool");
+		createDir(filter_pool9, true);
+		//create a file inside this folder
+		IFileStore filter_pool9_xml = filter_pool9.getChild("filterPool_Team Filter Pool.xmi");
+		content = getRandomString();
+		createFile(filter_pool9_xml, content);
+		
+		//create file inside the Team folder.
+		IFileStore profile_xml = Team.getChild("profile.xmi");
+		content = getRandomString();
+		createFile(profile_xml, content);
+		
+		//Now create another folder TypeFilters in the RemoteSystemsConnections folder
+		IFileStore TypeFilters = RemoteSystemsConnections.getChild("TypeFilters");
+		createDir(TypeFilters, true);
+		dummyFile = TypeFilters.getChild("dummy.txt");
+		content = getRandomString();
+		createFile(dummyFile, content);
+		//Now create another folder xuanchentp in the RemoteSystemsConnections folder
+		IFileStore xuanchentp = RemoteSystemsConnections.getChild("xuanchentp");
+		createDir(xuanchentp, true);
+		//Create some files and folder inside the xuanchentp folder
+		IFileStore Connections1 = xuanchentp.getChild("Connections");
+		createDir(Connections1, true);
+		dummyFile = Connections1.getChild("dummy.txt");
+		content = getRandomString();
+		createFile(dummyFile, content);
+		IFileStore Filters1 = xuanchentp.getChild("Filters");
+		createDir(Filters1, true);
+		dummyFile = Filters1.getChild("dummy.txt");
+		content = getRandomString();
+		createFile(dummyFile, content);
+		IFileStore profile_xml1 = xuanchentp.getChild("profile.xmi");
+		content = getRandomString();
+		createFile(profile_xml1, content);
+		//now create two other files inside folder RemoteSystemConnections
+		IFileStore compatibility = RemoteSystemsConnections.getChild(".compatibility");
+		content = getRandomString();
+		createFile(compatibility, content);
+		IFileStore project = RemoteSystemsConnections.getChild(".project");
+		createFile(project, content);
+		
+		//Now, we need to create the content of mynewzip.zip file
+		IFileStore folder_6YLT5Xa = temp.getChild(folderToCopyName2);
+		createDir(folder_6YLT5Xa, true);
+		IFileStore folder_20070315a = folder_6YLT5Xa.getChild("20070315a");
+		createDir(folder_20070315a, true);
+		IFileStore QB5ROUTaadd = folder_20070315a.getChild("QB5ROUTaadd");
+		content = getRandomString();
+		createFile(QB5ROUTaadd, content);
+		IFileStore folder_20070319 = folder_6YLT5Xa.getChild("20070319");
+		createDir(folder_20070319, true);
+		content = getRandomString();
+		IFileStore QB5ROUTERa = folder_20070319.getChild("QB5ROUTERa");
+		content = getRandomString();
+		createFile(QB5ROUTERa, content);
+		IFileStore folder_20070320a = folder_6YLT5Xa.getChild("20070320a");
+		createDir(folder_20070320a, true);
+		IFileStore QB5ROupdfasd = folder_20070320a.getChild("QB5ROupdfasd");
+		content = getRandomString();
+		createFile(QB5ROupdfasd, content);
+		IFileStore folder_20070404a = folder_6YLT5Xa.getChild("20070404a");
+		createDir(folder_20070404a, true);
+		IFileStore qb5routeraad = folder_20070404a.getChild("qb5routeraad");
+		content = getRandomString();
+		createFile(qb5routeraad, content);
+		IFileStore dummyFolder = folder_6YLT5Xa.getChild("dummyFolder");
+		createDir(dummyFolder, true);
+		IFileStore folder_20070404a1 = dummyFolder.getChild("20070404a");
+		createDir(folder_20070404a1, true);
+		IFileStore qb5routeraa = folder_20070404a1.getChild("qb5routeraa");
+		content = getRandomString();
+		createFile(qb5routeraa, content);
+		IFileStore epdcdump01_hex12ab = dummyFolder.getChild("epdcdump01.hex12ab");
+		content = getRandomString();
+		createFile(epdcdump01_hex12ab, content);
+		
+		//now, copy folderToCopy into the folder in the remote system
+		IRemoteFile sourceFolderToCopy1 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName1, mon);
+		ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy1).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet = new SystemRemoteResourceSet(localFss, srcAdapter1);
+		fromSet.addResource(sourceFolderToCopy1);
+		ISystemResourceSet tempObjects1 = srcAdapter1.doDrag(fromSet, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects1, tempDir, mon, true);
+		
+		IRemoteFile sourceFolderToCopy2 = localFss.getRemoteFileObject(tempPath + '\\' + folderToCopyName2, mon);
+		ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) sourceFolderToCopy2).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(localFss, srcAdapter2);
+		fromSet2.addResource(sourceFolderToCopy2);
+		ISystemResourceSet tempObjects2 = srcAdapter2.doDrag(fromSet2, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, tempDir, mon, true);
+		
+		IRemoteFile zipSource1 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName1, false);
+		assertTrue(zipSource1 != null);
+		IRemoteFile zipSourceFolder = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName1);
+		fss.copy(zipSourceFolder, zipSource1, folderToCopyName1, mon);
+		
+		IRemoteFile zipSource2 = createFileOrFolder(tempDir.getAbsolutePath(), zipSourceFileName2, false);
+		assertTrue(zipSource2 != null);
+		IRemoteFile zipSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName2);
+		fss.copy(zipSourceFolder2, zipSource2, folderToCopyName2, mon);
+		
+		//Then, we need to retrieve children of the tempDir to cache their information.
+		fss.resolveFilterString(tempDir, null, mon);
+		
+		//Then, delete the temp folder in the junit workspace.
+		temp.delete(EFS.NONE, mon);
 	}
-	
-	public void tearDown() {
-		try {
-			fss.delete(tempDir, mon);
-		} catch(SystemMessageException msg) {
-			assertFalse("Exception: "+msg.getLocalizedMessage(), true); //$NON-NLS-1$
-		}
-	}
-	
-	public void testCreateZipFile() throws SystemMessageException {
+
+	public void testCreateZipFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//Create the zip file first.
 		String testName = "dummy.zip";
 		IRemoteFile newArchiveFile = createFileOrFolder(tempDirPath, testName, false);
-		assertTrue(newArchiveFile != null);
+		assertNotNull(newArchiveFile);
 		assertTrue(newArchiveFile.exists());
 		assertTrue(newArchiveFile.canRead());
 		assertTrue(newArchiveFile.canWrite());
@@ -425,16 +345,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[] namesToCheck = {"aaa.txt", "bbb.txt", "folder1"};
@@ -463,7 +383,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 	}
 	
-	public void testRenameVirtualFile() throws SystemMessageException {
+	public void testRenameVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//Create the zip file first.
@@ -534,7 +454,7 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		
 	}
 	
-	public void testMoveVirtualFile() throws SystemMessageException {
+	public void testMoveVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//Create the source data needed for testing
@@ -549,36 +469,26 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceZipFile = (IRemoteFile)getChildFromFolder(tempDir, sourceZipFileName);
 		
 		//Now, copy one of the folder from the zip file into folder1
-		try
-		{
-			Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
-			IRemoteFile originalVirtualFolder = (IRemoteFile)children[0];
-			String movedFolderName = originalVirtualFolder.getName();
-			fss.move(originalVirtualFolder, folder1, movedFolderName, mon);
-			
-			
-			Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
-			
-			assertTrue(movedVirtualFolder != null);
-			
-			String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
-			
-			//Now, make sure the moved virtual folder is gone from its original zip file
-			children = fss.resolveFilterString(sourceZipFile, null, mon);
-			assertTrue(children.length == 0);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
+		IRemoteFile originalVirtualFolder = (IRemoteFile)children[0];
+		String movedFolderName = originalVirtualFolder.getName();
+		fss.move(originalVirtualFolder, folder1, movedFolderName, mon);
 		
-		return;
 		
+		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
+		
+		assertTrue(movedVirtualFolder != null);
+		
+		String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
+		
+		//Now, make sure the moved virtual folder is gone from its original zip file
+		children = fss.resolveFilterString(sourceZipFile, null, mon);
+		assertTrue(children.length == 0);
 	}
 	
-	public void testMoveVirtualFileLevelTwo() throws SystemMessageException {
+	public void testMoveVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -593,39 +503,28 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(sourceZipFile != null);
 		
 		//Now, move one of the level two folder from the zip file into folder1
-		try
-		{
-			//Now, copy one of the level two folder from the zip file into folder1
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
-			String movedFolderName = secondLevelChild.getName();
-			
-			//copy this level two childer into folder1
-			fss.move(secondLevelChild, folder1, movedFolderName, mon);
-			
-			Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
-			
-			assertTrue(movedVirtualFolder != null);
-			
-			String[] contents = {"Connections", "Filters", "profile.xmi"};
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
-			checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
-			
-			//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.
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
+		String movedFolderName = secondLevelChild.getName();
 		
-		return;
+		//copy this level two childer into folder1
+		fss.move(secondLevelChild, folder1, movedFolderName, mon);
 		
+		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
+		
+		assertTrue(movedVirtualFolder != null);
+		
+		String[] contents = {"Connections", "Filters", "profile.xmi"};
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
+		checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
+		
+		//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.
 	}
 	
-	public void testMoveToArchiveFile() throws SystemMessageException {
+	public void testMoveToArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -639,35 +538,26 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
-		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
-		try
-		{
-			fss.move(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
-			
-			Object theMovedChild = getChildFromFolder(targetZipFile, sourceFolderName);
-			assertTrue(theMovedChild != null);
-			
-			//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)theMovedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			//make sure the original folder is gone.
-			IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
-			Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-			assertFalse(originalSource != null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Now, move one of the folder from the sourceFolder into copiedTargetZipFile
+		fss.move(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
 		
-		return;
+		Object theMovedChild = getChildFromFolder(targetZipFile, sourceFolderName);
+		assertTrue(theMovedChild != null);
+		
+		//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)theMovedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		//make sure the original folder is gone.
+		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
+		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
+		assertFalse(originalSource != null);
 	}
 	
-	public void testMoveToVirtualFileLevelOne() throws SystemMessageException {
+	public void testMoveToVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -681,38 +571,28 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//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.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
 		
-		try
-		{
-			//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.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			
-			fss.move(sourceFolder, firstLevelChild, sourceFolderName, mon);
-			
-			Object theMovedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
-			
-			assertTrue(theMovedChild != null);
-			
-			//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)theMovedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
-			Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-			assertFalse(originalSource != null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.move(sourceFolder, firstLevelChild, sourceFolderName, mon);
 		
-		return;
+		Object theMovedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
+		
+		assertTrue(theMovedChild != null);
+		
+		//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)theMovedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
+		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
+		assertFalse(originalSource != null);
 	}
 	
-	public void testMoveToVirtualFileLevelTwo() throws SystemMessageException {
+	public void testMoveToVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -726,41 +606,29 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//Get one of its second level children, and move the folder to there.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
 		
-		try
-		{
-			//Get one of its second level children, and move the folder to there.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
-			
-			fss.move(sourceFolder, secondLevelChild, sourceFolder.getName(), mon);
-			
-			Object theMovedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
-			
-			assertTrue(theMovedChild != null);
-			
-			//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)theMovedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
-			Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
-			assertFalse(originalSource != null);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.move(sourceFolder, secondLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theMovedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
 		
+		assertTrue(theMovedChild != null);
+		
+		//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)theMovedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		IRemoteFile tempDirRemoteFile = fss.getRemoteFileObject(tempDirPath, mon);
+		Object originalSource = getChildFromFolder(tempDirRemoteFile, sourceFolderName);
+		assertFalse(originalSource != null);
 	}
 	
 	
-	public void testCopyVirtualFile() throws SystemMessageException {
+	public void testCopyVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -775,28 +643,19 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(folder1 != null);
 		
 		//Now, copy one of the folder from the zip file into folder1
-		try
-		{
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
-			fss.copy(firstLevelChild, folder1, folderToCopyName1, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, folderToCopyName1);
-			
-			assertTrue(copiedVirtualFolder != null);
-			
-			String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
+		fss.copy(firstLevelChild, folder1, folderToCopyName1, mon);
 		
-		return;
+		Object copiedVirtualFolder = getChildFromFolder(folder1, folderToCopyName1);
+		
+		assertTrue(copiedVirtualFolder != null);
+		
+		String[] contents = {"Team", "TypeFilters", "xuanchentp", ".compatibility", ".project"};
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
 	}
 	
-	public void testCopyVirtualFileLevelTwo() throws SystemMessageException {
+	public void testCopyVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -811,33 +670,23 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		try
-		{
-			//Now, copy one of the level two folder from the zip file into folder1
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
-			//copy this level two children into folder1
-			fss.copy(secondLevelChild, folder1, secondLevelChild.getName(), mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
-			
-			assertTrue(copiedVirtualFolder != null);
-			
-			String[] contents = {"Connections", "Filters", "profile.xmi"};
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Now, copy one of the level two folder from the zip file into folder1
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
+		//copy this level two children into folder1
+		fss.copy(secondLevelChild, folder1, secondLevelChild.getName(), mon);
 		
-		return;
+		Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
 		
+		assertTrue(copiedVirtualFolder != null);
+		
+		String[] contents = {"Connections", "Filters", "profile.xmi"};
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
 	}
 	
 	
-	public void testCopyToArchiveFile() throws SystemMessageException {
+	public void testCopyToArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -852,31 +701,22 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(sourceFolder != null);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
-		try
-		{
-			fss.copy(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(targetZipFile, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.copy(sourceFolder, targetZipFile, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(targetZipFile, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 	
 	
 	
-	public void testCopyToVirtualFileLevelOne() throws SystemMessageException {
+	public void testCopyToVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -890,35 +730,25 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//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.
+		//Now, copy one of the level two folder from the zip file into folder1
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
 		
-		try
-		{
-			//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.
-			//Now, copy one of the level two folder from the zip file into folder1
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			
-			fss.copy(sourceFolder, firstLevelChild, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.copy(sourceFolder, firstLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 	
 
-	public void testCopyToVirtualFileLevelTwo() throws SystemMessageException {
+	public void testCopyToVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -932,34 +762,24 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, folderToCopyName3);
 		assertTrue(sourceFolder != null);
 		
+		//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
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
 		
-		try
-		{
-			//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
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
-			
-			fss.copy(sourceFolder, secondLevelChild, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.copy(sourceFolder, secondLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(secondLevelChild, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 	
-	public void testCopyBatchToArchiveFile() throws SystemMessageException {
+	public void testCopyBatchToArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -975,55 +795,45 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(sourceFolder != null);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
-		try
-		{
-			IRemoteFile[] sourceFiles = new IRemoteFile[3];
-			//Also add some of its children into the batch.
-			String childToCopyName1 = "aaaaaaaa";
-			sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
-			String childToCopyName2 = "aaaab";
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
-			String childToCopyName3 = "epdcdump01.hex12a";
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
-			fss.copyBatch(sourceFiles, targetZipFile, mon);
-			
-			//Checking the first copied folder
-			Object theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName1);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
-			
-			int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
-			
-			//Checking the second copied folder
-			theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName2);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck2 = {"features"};
-			
-			int[] typesToCheck2 = {TYPE_FOLDER};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
-			
-			//Checking the third copied file
-			theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName3);
-			assertTrue(theCopiedChild != null);
-			assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IRemoteFile[] sourceFiles = new IRemoteFile[3];
+		//Also add some of its children into the batch.
+		String childToCopyName1 = "aaaaaaaa";
+		sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
+		String childToCopyName2 = "aaaab";
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
+		String childToCopyName3 = "epdcdump01.hex12a";
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
+		fss.copyBatch(sourceFiles, targetZipFile, mon);
 		
-		return;
+		//Checking the first copied folder
+		Object theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName1);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
+		
+		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
+		
+		//Checking the second copied folder
+		theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName2);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck2 = {"features"};
+		
+		int[] typesToCheck2 = {TYPE_FOLDER};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
+		
+		//Checking the third copied file
+		theCopiedChild = getChildFromFolder(targetZipFile, childToCopyName3);
+		assertTrue(theCopiedChild != null);
+		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
-	public void testCopyBatchToVirtualFileLevelOne() throws SystemMessageException {
+	public void testCopyBatchToVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1037,35 +847,25 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//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.
+		Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetZipFile, null, mon);
 		
-		try
-		{
-			//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.
-			Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetZipFile, null, mon);
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[1];
-			sourceFiles[0] = sourceFolder;
-			fss.copyBatch(sourceFiles, ((IRemoteFile)childrenOfTargetZipFile[0]), mon);
+		IRemoteFile[] sourceFiles = new IRemoteFile[1];
+		sourceFiles[0] = sourceFolder;
+		fss.copyBatch(sourceFiles, ((IRemoteFile)childrenOfTargetZipFile[0]), mon);
 
-			Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
 		
-		return;
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 
-	public void testCopyBatchToVirtualFileLevelTwo() throws SystemMessageException {
+	public void testCopyBatchToVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1080,61 +880,51 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
-		try
-		{
-			//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
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[3];
-			//Also add some of its children into the batch.
-			String childToCopyName1 = "aaaaaaaa";
-			sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
-			String childToCopyName2 = "aaaab";
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
-			String childToCopyName3 = "epdcdump01.hex12a";
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
-			fss.copyBatch(sourceFiles, secondLevelChild, mon);
-			
-			
-			//Checking the first copied folder
-			Object theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName1);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
-			
-			int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
-			
-			//Checking the second copied folder
-			theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName2);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck2 = {"features"};
-			
-			int[] typesToCheck2 = {TYPE_FOLDER};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
-			
-			//Checking the third copied file
-			theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName3);
-			assertTrue(theCopiedChild != null);
-			assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//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
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
 		
-		return;
+		IRemoteFile[] sourceFiles = new IRemoteFile[3];
+		//Also add some of its children into the batch.
+		String childToCopyName1 = "aaaaaaaa";
+		sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
+		String childToCopyName2 = "aaaab";
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
+		String childToCopyName3 = "epdcdump01.hex12a";
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
+		fss.copyBatch(sourceFiles, secondLevelChild, mon);
+		
+		
+		//Checking the first copied folder
+		Object theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName1);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
+		
+		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
+		
+		//Checking the second copied folder
+		theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName2);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck2 = {"features"};
+		
+		int[] typesToCheck2 = {TYPE_FOLDER};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
+		
+		//Checking the third copied file
+		theCopiedChild = getChildFromFolder(secondLevelChild, childToCopyName3);
+		assertTrue(theCopiedChild != null);
+		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
-	public void testCopyBatchVirtualFile() throws SystemMessageException {
+	public void testCopyBatchVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1149,47 +939,37 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(folder1 != null);
 		
 		//Now, copy one of the folder from the zip file into folder1
-		try
-		{
-			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);
-			String childToCopyName2 = "xuanchentp";
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName2);
-			assertTrue(sourceFiles[1] != null);
-			String childToCopyName3 = ".compatibility";
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName3);
-			assertTrue(sourceFiles[2] != null);
-			fss.copyBatch(sourceFiles, folder1, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, childToCopyName1);
-			assertTrue(copiedVirtualFolder != null);
-			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);
-			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);
-			assertTrue(((IRemoteFile)copiedVirtualFile).isDirectory() != true);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		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);
+		String childToCopyName2 = "xuanchentp";
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName2);
+		assertTrue(sourceFiles[1] != null);
+		String childToCopyName3 = ".compatibility";
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder((IRemoteFile)children[0], childToCopyName3);
+		assertTrue(sourceFiles[2] != null);
+		fss.copyBatch(sourceFiles, folder1, mon);
 		
-		return;
+		Object copiedVirtualFolder = getChildFromFolder(folder1, childToCopyName1);
+		assertTrue(copiedVirtualFolder != null);
+		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);
+		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);
+		assertTrue(((IRemoteFile)copiedVirtualFile).isDirectory() != true);
 	}
 
-	public void testCopyBatchVirtualFileLevelTwo() throws SystemMessageException {
+	public void testCopyBatchVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1203,35 +983,25 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		try
-		{
-			//Now, copy one of the level two folder from the zip file into folder1
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[1];
-			sourceFiles[0] = secondLevelChild;
-			//copy this level two childer into folder1
-			fss.copyBatch(sourceFiles, folder1, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
-			
-			assertTrue(copiedVirtualFolder != null);
-			
-			String[] contents = {"Connections", "Filters", "profile.xmi"};
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Now, copy one of the level two folder from the zip file into folder1
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "Team");
 		
-		return;
+		IRemoteFile[] sourceFiles = new IRemoteFile[1];
+		sourceFiles[0] = secondLevelChild;
+		//copy this level two childer into folder1
+		fss.copyBatch(sourceFiles, folder1, mon);
 		
+		Object copiedVirtualFolder = getChildFromFolder(folder1, secondLevelChild.getName());
+		
+		assertTrue(copiedVirtualFolder != null);
+		
+		String[] contents = {"Connections", "Filters", "profile.xmi"};
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FILE};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
 	}
 
-	public void testCopyVirtualBatchToArchiveFile() throws SystemMessageException {
+	public void testCopyVirtualBatchToArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1245,33 +1015,24 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		assertTrue(sourceFile != null);
 		
 		//Now, copy one of the folder from the sourceFile into copiedTargetZipFile
-		try
-		{
-			IRemoteFile[] sourceFiles = new IRemoteFile[1];
-			String virutalFolderToCopyName = "6YLT5Xa";
-			IRemoteFile virtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, virutalFolderToCopyName);
-			sourceFiles[0] = virtualFolderToCopy;
-			fss.copyBatch(sourceFiles, targetZipFile, mon);
-			
-			Object theCopiedChild = getChildFromFolder(targetZipFile, virutalFolderToCopyName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck = {"20070315a", "20070319", "20070320a", "20070404a", "dummyFolder"};
-			
-			int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IRemoteFile[] sourceFiles = new IRemoteFile[1];
+		String virutalFolderToCopyName = "6YLT5Xa";
+		IRemoteFile virtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, virutalFolderToCopyName);
+		sourceFiles[0] = virtualFolderToCopy;
+		fss.copyBatch(sourceFiles, targetZipFile, mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(targetZipFile, virutalFolderToCopyName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck = {"20070315a", "20070319", "20070320a", "20070404a", "dummyFolder"};
+		
+		int[] typesToCheck = {TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER, TYPE_FOLDER};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 
-	public void testCopyVirtualBatchToVirtualFileLevelOne() throws SystemMessageException {
+	public void testCopyVirtualBatchToVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1284,60 +1045,50 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFile = (IRemoteFile)getChildFromFolder(tempDir, sourcefileName);
 		assertTrue(sourceFile != null);
 		
-		try
-		{
-			//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.
-			Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetZipFile, null, mon);
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[3];
-			
-			String parentOfVirutalFolderToCopyName = "6YLT5Xa";
-			IRemoteFile parentOfVirtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, parentOfVirutalFolderToCopyName);
-			String virtualChildToCopyName1 = "20070315a";
-			String virtualChildToCopyName2 = "20070319";
-			String virtualChildToCopyName3 = "dummyFolder";
-			
-			sourceFiles[0] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName1);
-			assertTrue(sourceFiles[0] != null);
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName2);
-			assertTrue(sourceFiles[1] != null);
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName3);
-			assertTrue(sourceFiles[2] != null);
-			fss.copyBatch(sourceFiles, ((IRemoteFile)childrenOfTargetZipFile[0]), mon);
-	
-			
-			Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), virtualChildToCopyName1);
-			assertTrue(theCopiedChild != null);
-			//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);
-			//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);
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck3 = {"20070404a", "epdcdump01.hex12ab"};
-			int[] typesToCheck3 = {TYPE_FOLDER, TYPE_FILE};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck3, typesToCheck3);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//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.
+		Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetZipFile, null, mon);
 		
-		return;
+		IRemoteFile[] sourceFiles = new IRemoteFile[3];
+		
+		String parentOfVirutalFolderToCopyName = "6YLT5Xa";
+		IRemoteFile parentOfVirtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, parentOfVirutalFolderToCopyName);
+		String virtualChildToCopyName1 = "20070315a";
+		String virtualChildToCopyName2 = "20070319";
+		String virtualChildToCopyName3 = "dummyFolder";
+		
+		sourceFiles[0] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName1);
+		assertTrue(sourceFiles[0] != null);
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName2);
+		assertTrue(sourceFiles[1] != null);
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualChildToCopyName3);
+		assertTrue(sourceFiles[2] != null);
+		fss.copyBatch(sourceFiles, ((IRemoteFile)childrenOfTargetZipFile[0]), mon);
+
+		
+		Object theCopiedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), virtualChildToCopyName1);
+		assertTrue(theCopiedChild != null);
+		//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);
+		//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);
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck3 = {"20070404a", "epdcdump01.hex12ab"};
+		int[] typesToCheck3 = {TYPE_FOLDER, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck3, typesToCheck3);
 	}
 
-	public void testCopyVirtualBatchToVirtualFileLevelTwo() throws SystemMessageException {
+	public void testCopyVirtualBatchToVirtualFileLevelTwo() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceZipFiles();
@@ -1350,39 +1101,30 @@ public class FileServiceArchiveTest extends FileServiceBaseTest {
 		IRemoteFile sourceFile = (IRemoteFile)getChildFromFolder(tempDir,  sourcefileName);
 		assertTrue(sourceFile != null);
 		
-		try
-		{
-			//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
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[1];
-			
-			String parentOfVirutalFolderToCopyName = "6YLT5Xa";
-			IRemoteFile parentOfVirtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, parentOfVirutalFolderToCopyName);
-			String virtualFolderToCopyName = "dummyFolder";
-			IRemoteFile virtualFolderToCopy = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualFolderToCopyName);
-			
-			sourceFiles[0] = virtualFolderToCopy;
-			
-			fss.copyBatch(sourceFiles, secondLevelChild, mon);
-			
-			Object theCopiedChild = getChildFromFolder(parentOfVirtualFolderToCopy, virtualFolderToCopyName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//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
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetZipFile, folderToCopyName1);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "TypeFilters");
 		
-		return;
+		IRemoteFile[] sourceFiles = new IRemoteFile[1];
+		
+		String parentOfVirutalFolderToCopyName = "6YLT5Xa";
+		IRemoteFile parentOfVirtualFolderToCopy = (IRemoteFile)getChildFromFolder(sourceFile, parentOfVirutalFolderToCopyName);
+		String virtualFolderToCopyName = "dummyFolder";
+		IRemoteFile virtualFolderToCopy = (IRemoteFile)getChildFromFolder(parentOfVirtualFolderToCopy, virtualFolderToCopyName);
+		
+		sourceFiles[0] = virtualFolderToCopy;
+		
+		fss.copyBatch(sourceFiles, secondLevelChild, mon);
+		
+		Object theCopiedChild = getChildFromFolder(parentOfVirtualFolderToCopy, virtualFolderToCopyName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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);
 	}
 
 }
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 0916eab397f..2b9a763522c 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
@@ -28,7 +28,6 @@ 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.files.ui.resources.UniversalFileTransferUtility;
-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;
@@ -44,6 +43,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 	protected String tarSourceFolderName1 = "META-INF";
 	protected String tarSourceFolderName2 = "org";
 	
+	private boolean fPreference_ALERT_SSL;
+	private boolean fPreference_ALERT_NONSSL;
+	
 	public static junit.framework.Test suite() {
 		TestSuite suite = new TestSuite("FileServiceArchiveTestDStore");
 		
@@ -94,7 +96,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 	
 	
 	
-	public void setUp() {
+	public void setUp() throws Exception {
+		super.setUp();
+		
 		//We need to delay if it is first case run after a workspace startup
 		SYSTEM_TYPE_ID = IRSESystemType.SYSTEMTYPE_LINUX_ID;
 		SYSTEM_ADDRESS = "SLES8RM";
@@ -102,27 +106,16 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		USER_ID = "xuanchen";
 		PASSWORD = "xxxxxx";
 		
-		if (!classBeenRunBefore)
-		{
-			IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-			
-			//We need to setDefault first in order to set the value of a preference.  
-			store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
-			store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
-			store.setValue(ISystemPreferencesConstants.ALERT_SSL, false);
-			store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, false);
-			
-			try
-			{
-				System.out.println("need to sleep");
-				Thread.sleep(500);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			classBeenRunBefore = true;
-		}
+		//Ensure that the SSL acknowledge dialog does not show up. 
+		//We need to setDefault first in order to set the value of a preference.  
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
+		store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
+		fPreference_ALERT_SSL = store.getBoolean(ISystemPreferencesConstants.ALERT_SSL);
+		fPreference_ALERT_NONSSL = store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL);
+		store.setValue(ISystemPreferencesConstants.ALERT_SSL, false);
+		store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, false);
+
 		IHost dstoreHost = getRemoteSystemConnection(SYSTEM_TYPE_ID, SYSTEM_ADDRESS, SYSTEM_NAME, USER_ID, PASSWORD);
 		assertTrue(dstoreHost != null);
 		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
@@ -192,183 +185,174 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		}
 	}
 	
-	public void tearDown() {
-		try {
-			fss.delete(tempDir, mon);
-		} catch(SystemMessageException msg) {
-			assertFalse("Exception: "+msg.getLocalizedMessage(), true); //$NON-NLS-1$
-		}
+	public void tearDown() throws Exception {
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		store.setValue(ISystemPreferencesConstants.ALERT_SSL, fPreference_ALERT_SSL);
+		store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, fPreference_ALERT_NONSSL);
+		super.tearDown();
 	}
 	
-	public void createSourceTarFiles()
+	public void createSourceTarFiles() throws Exception
 	{
-		try
-		{
-			String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
-			IFileStore temp = createDir(tempPath, true);
-			String content = getRandomString();
-			
-			//Now, we need to construct a "source.tar" archive file
-			//We will construct the content of the tar file in folders "META-INF" and "org"
-			//Then we copy this folder into a tar file by RSE API.
-			IFileStore META_INF = temp.getChild(tarSourceFolderName1);
-			createDir(META_INF, true);
-			//Now, populate the contents in the folder.
-			IFileStore MANIFEST_MF = META_INF.getChild("MANIFEST.MF");
-			content = getRandomString();
-			createFile(MANIFEST_MF, content);
-			//create folder "org"
-			IFileStore org = temp.getChild(tarSourceFolderName2);
-			createDir(org, true);
-			IFileStore eclipse = org.getChild("eclipse");
-			createDir(eclipse, true);
-			//create "dstore" folder inside "org"
-			IFileStore dstore = eclipse.getChild("dstore");
-			createDir(dstore, true);
-			//Now, create a few folders inside the dstore folder.
-			IFileStore core = dstore.getChild("core");
-			createDir(core, true);
-			IFileStore internal = dstore.getChild("internal");
-			createDir(internal, true);
-			
-			//now create directory inside "core":
-			IFileStore client = core.getChild("client");
-			createDir(client, true);
-			IFileStore java = core.getChild("java");
-			createDir(java, true);
-			IFileStore miners = core.getChild("miners");
-			createDir(miners, true);
-			IFileStore model = core.getChild("model");
-			createDir(model, true);
-			IFileStore server = core.getChild("server");
-			createDir(server, true);
-			IFileStore util = core.getChild("util");
-			createDir(util, true);
-			IFileStore Activator_java = core.getChild("Activator.java");
-			content = getRandomString();
-			createFile(Activator_java, content);
-			
-			//now, some contents on client folder
-			IFileStore ClientConnection_java = client.getChild("ClientConnection.java");
-			content = getRandomString();
-			createFile(ClientConnection_java, content);
-			IFileStore ConnectionStatus_java = client.getChild("ConnectionStatus.java");
-			content = getRandomString();
-			createFile(ConnectionStatus_java, content);
-			
-			//now, some contents in java folder
-			IFileStore ClassByteStreamHandler$ReceiveClassInstanceThread_java = java.getChild("ClassByteStreamHandler$ReceiveClassInstanceThread.java");
-			content = getRandomString();
-			createFile(ClassByteStreamHandler$ReceiveClassInstanceThread_java, content);
-			
-			//now, some contents in miners folder
-			IFileStore Miner_java = miners.getChild("Miner.java");
-			content = getRandomString();
-			createFile(Miner_java, content);
-			IFileStore MinerThread_java = miners.getChild("MinerThread.java");
-			content = getRandomString();
-			createFile(MinerThread_java, content);
-			
-			//now, some contents in model folder
-			IFileStore ByteStreamHandler_java = model.getChild("ByteStreamHandler.java");
-			content = getRandomString();
-			createFile(ByteStreamHandler_java, content);
-			IFileStore DE_java = model.getChild("DE.java");
-			content = getRandomString();
-			createFile(DE_java, content);
-			IFileStore Handler_java = model.getChild("Handler.java");
-			content = getRandomString();
-			createFile(Handler_java, content);
-			
-			//now, some contents in server folder
-			IFileStore Server_java = server.getChild("Server.java");
-			content = getRandomString();
-			createFile(Server_java, content);
-			
-			//now, some contents in util folder
-			IFileStore StringCompare_java = util.getChild("StringCompare.java");
-			content = getRandomString();
-			createFile(StringCompare_java, content);
-			
-			//now, create the contents in "internal" folder
-			IFileStore core1 = internal.getChild("core");
-			createDir(core1, true);
-			
-			//then create some folder in this "core" folder
-			IFileStore client1 = core1.getChild("client");
-			createDir(client1, true);
-			IFileStore model1 = core1.getChild("model");
-			createDir(model1, true);
-			IFileStore server1 = core1.getChild("server");
-			createDir(server1, true);
-			IFileStore util1 = core1.getChild("util");
-			createDir(util1, true);
-			
-			//now, some contents on client folder
-			IFileStore ClientConnection_java1 = client1.getChild("ClientConnection.java");
-			content = getRandomString();
-			createFile(ClientConnection_java1, content);
-			IFileStore ConnectionStatus_java1 = client1.getChild("ConnectionStatus.java");
-			content = getRandomString();
-			createFile(ConnectionStatus_java1, content);
-			
-			
-			//now, some contents in model folder
-			IFileStore ByteStreamHandler_java1 = model1.getChild("ByteStreamHandler.java");
-			content = getRandomString();
-			createFile(ByteStreamHandler_java1, content);
-			IFileStore DE_java1 = model1.getChild("DE.java");
-			content = getRandomString();
-			createFile(DE_java1, content);
-			IFileStore Handler_java1 = model1.getChild("Handler.java");
-			content = getRandomString();
-			createFile(Handler_java1, content);
-			
-			//now, some contents in server folder
-			IFileStore Server_java1 = server1.getChild("Server.java");
-			content = getRandomString();
-			createFile(Server_java1, content);
-			
-			//now, some contents in util folder
-			IFileStore StringCompare_java1 = util1.getChild("StringCompare.java");
-			content = getRandomString();
-			createFile(StringCompare_java1, content);
-			
-			//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);
-			ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) META_INF_folder).getAdapter(ISystemDragDropAdapter.class);
-			SystemRemoteResourceSet fromSet = new SystemRemoteResourceSet(localFss, srcAdapter1);
-			fromSet.addResource(META_INF_folder);
-			ISystemResourceSet tempObjects1 = srcAdapter1.doDrag(fromSet, mon);
-			UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects1, tempDir, mon, true);
-			
-			//now, copy org into the folder in the remote system
-			IRemoteFile org_folder = localFss.getRemoteFileObject(tempPath + '\\' + tarSourceFolderName2, mon);
-			assertTrue(org_folder != null);
-			ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) org_folder).getAdapter(ISystemDragDropAdapter.class);
-			SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(localFss, srcAdapter2);
-			fromSet2.addResource(org_folder);
-			ISystemResourceSet tempObjects2 = srcAdapter2.doDrag(fromSet2, mon);
-			UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, tempDir, mon, true);
-			
-			//now, create tar file in the host
-			IRemoteFile tarSource = createFileOrFolder(tempDir.getAbsolutePath(), tarSourceFileName1, false);
-			assertTrue(tarSource != null);
-			IRemoteFile tarSourceFolder1 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName1); 
-			assertTrue(tarSourceFolder1 != null);
-			IRemoteFile tarSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName2);
-			fss.copy(tarSourceFolder1, tarSource, tarSourceFolderName1, mon);
-			fss.copy(tarSourceFolder2, tarSource, tarSourceFolderName2, mon);
-			return;
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
+		String tempPath = getWorkspace().getRoot().getLocation().append("temp").toString();
+		IFileStore temp = createDir(tempPath, true);
+		String content = getRandomString();
+		
+		//Now, we need to construct a "source.tar" archive file
+		//We will construct the content of the tar file in folders "META-INF" and "org"
+		//Then we copy this folder into a tar file by RSE API.
+		IFileStore META_INF = temp.getChild(tarSourceFolderName1);
+		createDir(META_INF, true);
+		//Now, populate the contents in the folder.
+		IFileStore MANIFEST_MF = META_INF.getChild("MANIFEST.MF");
+		content = getRandomString();
+		createFile(MANIFEST_MF, content);
+		//create folder "org"
+		IFileStore org = temp.getChild(tarSourceFolderName2);
+		createDir(org, true);
+		IFileStore eclipse = org.getChild("eclipse");
+		createDir(eclipse, true);
+		//create "dstore" folder inside "org"
+		IFileStore dstore = eclipse.getChild("dstore");
+		createDir(dstore, true);
+		//Now, create a few folders inside the dstore folder.
+		IFileStore core = dstore.getChild("core");
+		createDir(core, true);
+		IFileStore internal = dstore.getChild("internal");
+		createDir(internal, true);
+		
+		//now create directory inside "core":
+		IFileStore client = core.getChild("client");
+		createDir(client, true);
+		IFileStore java = core.getChild("java");
+		createDir(java, true);
+		IFileStore miners = core.getChild("miners");
+		createDir(miners, true);
+		IFileStore model = core.getChild("model");
+		createDir(model, true);
+		IFileStore server = core.getChild("server");
+		createDir(server, true);
+		IFileStore util = core.getChild("util");
+		createDir(util, true);
+		IFileStore Activator_java = core.getChild("Activator.java");
+		content = getRandomString();
+		createFile(Activator_java, content);
+		
+		//now, some contents on client folder
+		IFileStore ClientConnection_java = client.getChild("ClientConnection.java");
+		content = getRandomString();
+		createFile(ClientConnection_java, content);
+		IFileStore ConnectionStatus_java = client.getChild("ConnectionStatus.java");
+		content = getRandomString();
+		createFile(ConnectionStatus_java, content);
+		
+		//now, some contents in java folder
+		IFileStore ClassByteStreamHandler$ReceiveClassInstanceThread_java = java.getChild("ClassByteStreamHandler$ReceiveClassInstanceThread.java");
+		content = getRandomString();
+		createFile(ClassByteStreamHandler$ReceiveClassInstanceThread_java, content);
+		
+		//now, some contents in miners folder
+		IFileStore Miner_java = miners.getChild("Miner.java");
+		content = getRandomString();
+		createFile(Miner_java, content);
+		IFileStore MinerThread_java = miners.getChild("MinerThread.java");
+		content = getRandomString();
+		createFile(MinerThread_java, content);
+		
+		//now, some contents in model folder
+		IFileStore ByteStreamHandler_java = model.getChild("ByteStreamHandler.java");
+		content = getRandomString();
+		createFile(ByteStreamHandler_java, content);
+		IFileStore DE_java = model.getChild("DE.java");
+		content = getRandomString();
+		createFile(DE_java, content);
+		IFileStore Handler_java = model.getChild("Handler.java");
+		content = getRandomString();
+		createFile(Handler_java, content);
+		
+		//now, some contents in server folder
+		IFileStore Server_java = server.getChild("Server.java");
+		content = getRandomString();
+		createFile(Server_java, content);
+		
+		//now, some contents in util folder
+		IFileStore StringCompare_java = util.getChild("StringCompare.java");
+		content = getRandomString();
+		createFile(StringCompare_java, content);
+		
+		//now, create the contents in "internal" folder
+		IFileStore core1 = internal.getChild("core");
+		createDir(core1, true);
+		
+		//then create some folder in this "core" folder
+		IFileStore client1 = core1.getChild("client");
+		createDir(client1, true);
+		IFileStore model1 = core1.getChild("model");
+		createDir(model1, true);
+		IFileStore server1 = core1.getChild("server");
+		createDir(server1, true);
+		IFileStore util1 = core1.getChild("util");
+		createDir(util1, true);
+		
+		//now, some contents on client folder
+		IFileStore ClientConnection_java1 = client1.getChild("ClientConnection.java");
+		content = getRandomString();
+		createFile(ClientConnection_java1, content);
+		IFileStore ConnectionStatus_java1 = client1.getChild("ConnectionStatus.java");
+		content = getRandomString();
+		createFile(ConnectionStatus_java1, content);
+		
+		
+		//now, some contents in model folder
+		IFileStore ByteStreamHandler_java1 = model1.getChild("ByteStreamHandler.java");
+		content = getRandomString();
+		createFile(ByteStreamHandler_java1, content);
+		IFileStore DE_java1 = model1.getChild("DE.java");
+		content = getRandomString();
+		createFile(DE_java1, content);
+		IFileStore Handler_java1 = model1.getChild("Handler.java");
+		content = getRandomString();
+		createFile(Handler_java1, content);
+		
+		//now, some contents in server folder
+		IFileStore Server_java1 = server1.getChild("Server.java");
+		content = getRandomString();
+		createFile(Server_java1, content);
+		
+		//now, some contents in util folder
+		IFileStore StringCompare_java1 = util1.getChild("StringCompare.java");
+		content = getRandomString();
+		createFile(StringCompare_java1, content);
+		
+		//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);
+		ISystemDragDropAdapter srcAdapter1 = (ISystemDragDropAdapter) ((IAdaptable) META_INF_folder).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet = new SystemRemoteResourceSet(localFss, srcAdapter1);
+		fromSet.addResource(META_INF_folder);
+		ISystemResourceSet tempObjects1 = srcAdapter1.doDrag(fromSet, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects1, tempDir, mon, true);
+		
+		//now, copy org into the folder in the remote system
+		IRemoteFile org_folder = localFss.getRemoteFileObject(tempPath + '\\' + tarSourceFolderName2, mon);
+		assertTrue(org_folder != null);
+		ISystemDragDropAdapter srcAdapter2 = (ISystemDragDropAdapter) ((IAdaptable) org_folder).getAdapter(ISystemDragDropAdapter.class);
+		SystemRemoteResourceSet fromSet2 = new SystemRemoteResourceSet(localFss, srcAdapter2);
+		fromSet2.addResource(org_folder);
+		ISystemResourceSet tempObjects2 = srcAdapter2.doDrag(fromSet2, mon);
+		UniversalFileTransferUtility.copyWorkspaceResourcesToRemote((SystemWorkspaceResourceSet)tempObjects2, tempDir, mon, true);
+		
+		//now, create tar file in the host
+		IRemoteFile tarSource = createFileOrFolder(tempDir.getAbsolutePath(), tarSourceFileName1, false);
+		assertTrue(tarSource != null);
+		IRemoteFile tarSourceFolder1 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName1); 
+		assertTrue(tarSourceFolder1 != null);
+		IRemoteFile tarSourceFolder2 = (IRemoteFile)getChildFromFolder(tempDir, tarSourceFolderName2);
+		fss.copy(tarSourceFolder1, tarSource, tarSourceFolderName1, mon);
+		fss.copy(tarSourceFolder2, tarSource, tarSourceFolderName2, mon);
 	}
 	
-	public void testCreateTarFile() throws SystemMessageException {
+	public void testCreateTarFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//Create the zip file first.
@@ -419,12 +403,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		String[] namesToCheck1 = {"ccc.exe", "ddd.bat", "another Folder"};
 		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FOLDER};
 		checkFolderContents(folder1, namesToCheck1, typesToCheck1);
-		
-		return;
-		
 	}
 	
-	public void testCopyToTarArchiveFile() throws SystemMessageException {
+	public void testCopyToTarArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -440,29 +421,20 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		assertTrue(sourceFolder != null);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
-		try
-		{
-			fss.copy(sourceFolder, targetTarFile, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(targetTarFile, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.copy(sourceFolder, targetTarFile, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(targetTarFile, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 
-	public void testCopyToTarVirtualFileLevelOne() throws SystemMessageException {
+	public void testCopyToTarVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -477,34 +449,24 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//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);
 		
-		try
-		{
-			//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);
-			
-			fss.copy(sourceFolder, firstLevelChild, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		fss.copy(sourceFolder, firstLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(firstLevelChild, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 
-	public void testCopyToTarVirtualFileLevelFour() throws SystemMessageException {
+	public void testCopyToTarVirtualFileLevelFour() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -519,39 +481,29 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//Get one of its fourth level children, and copy the folder to there.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
+		assertTrue(firstLevelChild != null);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
+		assertTrue(secondLevelChild != null);
+		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
+		assertTrue(thirdLevelChild != null);
+		IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
+		assertTrue(fourLevelChild != null);
 		
-		try
-		{
-			//Get one of its fourth level children, and copy the folder to there.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-			assertTrue(firstLevelChild != null);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-			assertTrue(secondLevelChild != null);
-			IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-			assertTrue(thirdLevelChild != null);
-			IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-			assertTrue(fourLevelChild != null);
-			
-			//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
-			fss.copy(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
-			assertTrue(theCopiedChild != null);
-			
-			//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)theCopiedChild, childrenToCheck, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
+		fss.copy(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
+		assertTrue(theCopiedChild != null);
+		
+		//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)theCopiedChild, childrenToCheck, typesToCheck);
 	}
 
-	public void testCopyTarVirtualFile() throws SystemMessageException {
+	public void testCopyTarVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -566,31 +518,21 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		//Now, copy one of the folders from the tar file into folder1
-		try
-		{
-			//Get one of its fourth level children, and copy the folder to there.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-			assertTrue(firstLevelChild != null);
-			
-			fss.copy(firstLevelChild, folder1, tarSourceFolderName1, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, tarSourceFolderName1);
-			assertTrue(copiedVirtualFolder != null);
-			
-			String[] contents = {"MANIFEST.MF"};
-			int[] typesToCheck = {TYPE_FILE};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Get one of its fourth level children, and copy the folder to there.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
+		assertTrue(firstLevelChild != null);
 		
-		return;
+		fss.copy(firstLevelChild, folder1, tarSourceFolderName1, mon);
+		
+		Object copiedVirtualFolder = getChildFromFolder(folder1, tarSourceFolderName1);
+		assertTrue(copiedVirtualFolder != null);
+		
+		String[] contents = {"MANIFEST.MF"};
+		int[] typesToCheck = {TYPE_FILE};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
 	}
 
-	public void testCopyTarVirtualFileLevelFour() throws SystemMessageException {
+	public void testCopyTarVirtualFileLevelFour() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -605,49 +547,71 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		try
-		{
-			//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);
-			
-			parentForDirectoryToCopyName ="eclipse";
-			parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
-			assertTrue(parentForDirectoryToCopy != null);
-			
-			parentForDirectoryToCopyName ="dstore";
-			parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
-			assertTrue(parentForDirectoryToCopy != null);
-			
-			String directoryToCopyName ="core";
-			IRemoteFile directoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, directoryToCopyName);
-			assertTrue(directoryToCopy != null);
-			
-			
-			//copy this level four children into folder1
-			fss.copy(directoryToCopy, folder1, directoryToCopyName, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, directoryToCopyName);
-			
-			assertTrue(copiedVirtualFolder != null);
-			
-			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};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//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);
 		
-		return;
+		parentForDirectoryToCopyName ="eclipse";
+		parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
+		assertTrue(parentForDirectoryToCopy != null);
 		
+		parentForDirectoryToCopyName ="dstore";
+		parentForDirectoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, parentForDirectoryToCopyName);
+		assertTrue(parentForDirectoryToCopy != null);
+		
+		String directoryToCopyName ="core";
+		IRemoteFile directoryToCopy = (IRemoteFile)getChildFromFolder(parentForDirectoryToCopy, directoryToCopyName);
+		assertTrue(directoryToCopy != null);
+		
+		
+		//copy this level four children into folder1
+		fss.copy(directoryToCopy, folder1, directoryToCopyName, mon);
+		
+		Object copiedVirtualFolder = getChildFromFolder(folder1, directoryToCopyName);
+		
+		assertTrue(copiedVirtualFolder != null);
+		
+		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};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
 	}
 
-	public void testMoveToTarArchiveFile() throws SystemMessageException {
+	public void testMoveToTarArchiveFile() throws Exception {
+		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
+		
+		//create the source for testing first
+		createSourceTarFiles();
+		createSourceFolders();
+		
+		String tarTargetFileName = tarSourceFileName1;
+		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
+		assertNotNull(targetTarFile);
+		
+		String sourceFolderName = folderToCopyName3;
+		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
+		assertNotNull(sourceFolder);
+		
+		fss.move(sourceFolder, targetTarFile, sourceFolder.getName(), mon);
+		
+		Object theMovedChild = getChildFromFolder(targetTarFile, sourceFolderName);
+		
+		assertNotNull(theMovedChild);
+		
+		//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)theMovedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
+		assertNull(originalSource);
+	}
+
+	public void testMoveToTarVirtualFileLevelOne() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -662,35 +626,28 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//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.
+		Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetTarFile, null, mon);
 		
-		//Now, move sourceFolder into targetTarFile
-		try
-		{
-			fss.move(sourceFolder, targetTarFile, sourceFolder.getName(), mon);
-			
-			Object theMovedChild = getChildFromFolder(targetTarFile, sourceFolderName);
-			
-			assertTrue(theMovedChild != null);
-			
-			//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)theMovedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
-			assertFalse(originalSource != null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
+		fss.move(sourceFolder, ((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName, mon);
 		
-		return;
+		Object theMovedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
+		
+		assertTrue(theMovedChild != null);
+		
+		//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)theMovedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
+		assertFalse(originalSource != null);
 	}
 
-	public void testMoveToTarVirtualFileLevelOne() throws SystemMessageException {
+	public void testMoveToVirtualFileLevelFour() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -705,90 +662,34 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
+		//Get one of its fourth level children, and copy the folder to there.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
+		assertTrue(firstLevelChild != null);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
+		assertTrue(secondLevelChild != null);
+		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
+		assertTrue(thirdLevelChild != null);
+		IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
+		assertTrue(fourLevelChild != null);
 		
-		try
-		{
-			//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.
-			Object[] childrenOfTargetZipFile = fss.resolveFilterString(targetTarFile, null, mon);
-			
-			//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
-			fss.move(sourceFolder, ((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName, mon);
-			
-			Object theMovedChild = getChildFromFolder(((IRemoteFile)childrenOfTargetZipFile[0]), sourceFolderName);
-			
-			assertTrue(theMovedChild != null);
-			
-			//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)theMovedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
-			assertFalse(originalSource != null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
+		fss.move(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
 		
-		return;
+		Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the moved 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)theCopiedChild, childrenToCheck, typesToCheck);
+		
+		//make sure the original folder is gone.
+		Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
+		assertFalse(originalSource != null);
 	}
 
-	public void testMoveToVirtualFileLevelFour() throws SystemMessageException {
-		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
-		
-		//create the source for testing first
-		createSourceTarFiles();
-		createSourceFolders();
-		
-		String tarTargetFileName = tarSourceFileName1;
-		IRemoteFile targetTarFile = (IRemoteFile)getChildFromFolder(tempDir, tarTargetFileName);
-		assertTrue(targetTarFile != null);
-		
-		String sourceFolderName = folderToCopyName3;
-		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
-		assertTrue(sourceFolder != null);
-		
-		
-		try
-		{
-			//Get one of its fourth level children, and copy the folder to there.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-			assertTrue(firstLevelChild != null);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-			assertTrue(secondLevelChild != null);
-			IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-			assertTrue(thirdLevelChild != null);
-			IRemoteFile fourLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-			assertTrue(fourLevelChild != null);
-			
-			//Object[] children = fss.resolveFilterString(sourceZipFile, null, mon);
-			fss.move(sourceFolder, fourLevelChild, sourceFolder.getName(), mon);
-			
-			Object theCopiedChild = getChildFromFolder(fourLevelChild, sourceFolderName);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the moved 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)theCopiedChild, childrenToCheck, typesToCheck);
-			
-			//make sure the original folder is gone.
-			Object originalSource = getChildFromFolder(tempDir, sourceFolderName);
-			assertFalse(originalSource != null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
-		
-		return;
-	}
-
-	public void testMoveTarVirtualFile() throws SystemMessageException {
+	public void testMoveTarVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -805,35 +706,25 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		assertTrue(folder1 != null);
 		
 		//Now, copy one of the folder from the zip file into folder1
-		try
-		{
-			String movedFolderName = tarSourceFolderName1;
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-			assertTrue(firstLevelChild != null);
-			fss.move(firstLevelChild, folder1, movedFolderName, mon);
-			
-			Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
-			
-			assertTrue(movedVirtualFolder != null);
-			
-			String[] contents = {"MANIFEST.MF"};
-			int[] typesToCheck = {TYPE_FILE};
-			checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
-			
-			//Now, make sure the moved virtual folder is gone from its original zip file
-			IRemoteFile tmp = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
-			assertTrue(tmp == null);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		String movedFolderName = tarSourceFolderName1;
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
+		assertTrue(firstLevelChild != null);
+		fss.move(firstLevelChild, folder1, movedFolderName, mon);
 		
-		return;
+		Object movedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
 		
+		assertTrue(movedVirtualFolder != null);
+		
+		String[] contents = {"MANIFEST.MF"};
+		int[] typesToCheck = {TYPE_FILE};
+		checkFolderContents((IRemoteFile)movedVirtualFolder, contents, typesToCheck);
+		
+		//Now, make sure the moved virtual folder is gone from its original zip file
+		IRemoteFile tmp = (IRemoteFile)getChildFromFolder(sourceTarFile, tarSourceFolderName1);
+		assertTrue(tmp == null);
 	}
 
-	public void testMoveTarVirtualFileLevelFour() throws SystemMessageException {
+	public void testMoveTarVirtualFileLevelFour() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -848,45 +739,35 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		try
-		{
-			//Get one of its fourth level children, and move it to the folder
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
-			assertTrue(firstLevelChild != null);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-			assertTrue(secondLevelChild != null);
-			IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-			assertTrue(thirdLevelChild != null);
-			IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-			assertTrue(fourthLevelChild != null);
-			String movedFolderName = fourthLevelChild.getName();
-			
-			//copy this level four children into folder1
-			fss.move(fourthLevelChild, folder1, movedFolderName, mon);
-			
-			Object copiedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
-			
-			assertTrue(copiedVirtualFolder != null);
-			
-			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};
-			checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
-			
-			//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.
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Get one of its fourth level children, and move it to the folder
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
+		assertTrue(firstLevelChild != null);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
+		assertTrue(secondLevelChild != null);
+		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
+		assertTrue(thirdLevelChild != null);
+		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
+		assertTrue(fourthLevelChild != null);
+		String movedFolderName = fourthLevelChild.getName();
 		
-		return;
+		//copy this level four children into folder1
+		fss.move(fourthLevelChild, folder1, movedFolderName, mon);
 		
+		Object copiedVirtualFolder = getChildFromFolder(folder1, movedFolderName);
+		
+		assertTrue(copiedVirtualFolder != null);
+		
+		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};
+		checkFolderContents((IRemoteFile)copiedVirtualFolder, contents, typesToCheck);
+		
+		//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.
 	}
 
-	public void testRenameTarVirtualFile() throws SystemMessageException {
+	public void testRenameTarVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//Create the zip file first.
@@ -952,12 +833,9 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//Check the result of rename
 		String[] newLevelTwoNamesToCheck = {"ccc.exe", "ddd1.bat", "some folder$"};
 		checkFolderContents(thisFolder, newLevelTwoNamesToCheck, levalTwoTypesToCheck);
-		
-		return;
-		
 	}
 
-	public void testDeleteTarVirtualFile() throws SystemMessageException {
+	public void testDeleteTarVirtualFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		//create the source for testing first
@@ -1022,15 +900,12 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		//check the result
 		fileToToDelete = (IRemoteFile)getChildFromFolder(parentForFileToDelete, deleteFileName);
 		
-		assertTrue(fileToToDelete == null);
-		
-		return;
-		
+		assertNull(fileToToDelete);
 	}
 
 
 
-	public void testCopyBatchToTarArchiveFile() throws SystemMessageException {
+	public void testCopyBatchToTarArchiveFile() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceTarFiles();
@@ -1046,57 +921,47 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		assertTrue(sourceFolder != null);
 		
 		//Now, copy one of the folder from the sourceFolder into copiedTargetZipFile
-		try
-		{
-			IRemoteFile[] sourceFiles = new IRemoteFile[3];
-			//Also add some of its children into the batch.
-			String childToCopyName1 = "aaaaaaaa";
-			sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
-			String childToCopyName2 = "aaaab";
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
-			String childToCopyName3 = "epdcdump01.hex12a";
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
-			fss.copyBatch(sourceFiles, targetTarFile, mon);
-			
-			//Checking the first copied folder
-			Object theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName1);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
-			
-			int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
-			
-			//Checking the second copied folder
-			theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName2);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck2 = {"features"};
-			
-			int[] typesToCheck2 = {TYPE_FOLDER};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
-			
-			//Checking the third copied file
-			theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName3);
-			assertTrue(theCopiedChild != null);
-			assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		IRemoteFile[] sourceFiles = new IRemoteFile[3];
+		//Also add some of its children into the batch.
+		String childToCopyName1 = "aaaaaaaa";
+		sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
+		String childToCopyName2 = "aaaab";
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
+		String childToCopyName3 = "epdcdump01.hex12a";
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
+		fss.copyBatch(sourceFiles, targetTarFile, mon);
 		
-		return;
+		//Checking the first copied folder
+		Object theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName1);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
+		
+		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
+		
+		//Checking the second copied folder
+		theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName2);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck2 = {"features"};
+		
+		int[] typesToCheck2 = {TYPE_FOLDER};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
+		
+		//Checking the third copied file
+		theCopiedChild = getChildFromFolder(targetTarFile, childToCopyName3);
+		assertTrue(theCopiedChild != null);
+		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
 
 
-	public void testCopyBatchToTarVirtualFileLevelFour() throws SystemMessageException {
+	public void testCopyBatchToTarVirtualFileLevelFour() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceTarFiles();
@@ -1111,68 +976,58 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile sourceFolder = (IRemoteFile)getChildFromFolder(tempDir, sourceFolderName);
 		assertTrue(sourceFolder != null);
 		
-		try
-		{
-			//Get one of its fourth level children, and copy the folder to there.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
-			assertTrue(firstLevelChild != null);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-			assertTrue(secondLevelChild != null);
-			IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-			assertTrue(thirdLevelChild != null);
-			IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-			assertTrue(fourthLevelChild != null);
-			
-			IRemoteFile[] sourceFiles = new IRemoteFile[3];
-			//Also add some of its children into the batch.
-			String childToCopyName1 = "aaaaaaaa";
-			sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
-			String childToCopyName2 = "aaaab";
-			sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
-			String childToCopyName3 = "epdcdump01.hex12a";
-			sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
-			fss.copyBatch(sourceFiles, fourthLevelChild, mon);
-			
-			
-			//Checking the first copied folder
-			Object theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName1);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
-			
-			int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
-			
-			//Checking the second copied folder
-			theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName2);
-			
-			assertTrue(theCopiedChild != null);
-			
-			//Also make sure the copied child has the right contents.
-			String[] childrenToCheck2 = {"features"};
-			
-			int[] typesToCheck2 = {TYPE_FOLDER};
-			checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
-			
-			//Checking the third copied file
-			theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName3);
-			assertTrue(theCopiedChild != null);
-			assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
-			
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Get one of its fourth level children, and copy the folder to there.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(targetTarFile, "org");
+		assertTrue(firstLevelChild != null);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
+		assertTrue(secondLevelChild != null);
+		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
+		assertTrue(thirdLevelChild != null);
+		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
+		assertTrue(fourthLevelChild != null);
 		
-		return;
+		IRemoteFile[] sourceFiles = new IRemoteFile[3];
+		//Also add some of its children into the batch.
+		String childToCopyName1 = "aaaaaaaa";
+		sourceFiles[0] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName1);
+		String childToCopyName2 = "aaaab";
+		sourceFiles[1] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName2);
+		String childToCopyName3 = "epdcdump01.hex12a";
+		sourceFiles[2] = (IRemoteFile)getChildFromFolder(sourceFolder, childToCopyName3);
+		fss.copyBatch(sourceFiles, fourthLevelChild, mon);
+		
+		
+		//Checking the first copied folder
+		Object theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName1);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck1 = {"adsf", "eclipse-SDK-3.3M6-win32.zip", "epdcdump01.hex12", "epdcdump01.hex12aaaa"};
+		
+		int[] typesToCheck1 = {TYPE_FILE, TYPE_FILE, TYPE_FILE, TYPE_FILE};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck1, typesToCheck1);
+		
+		//Checking the second copied folder
+		theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName2);
+		
+		assertTrue(theCopiedChild != null);
+		
+		//Also make sure the copied child has the right contents.
+		String[] childrenToCheck2 = {"features"};
+		
+		int[] typesToCheck2 = {TYPE_FOLDER};
+		checkFolderContents((IRemoteFile)theCopiedChild, childrenToCheck2, typesToCheck2);
+		
+		//Checking the third copied file
+		theCopiedChild = getChildFromFolder(fourthLevelChild, childToCopyName3);
+		assertTrue(theCopiedChild != null);
+		assertTrue(((IRemoteFile)theCopiedChild).isDirectory() != true);
 	}
 
 
 
-	public void testCopyBatchTarVirtualFileLevelFive() throws SystemMessageException {
+	public void testCopyBatchTarVirtualFileLevelFive() throws Exception {
 		if (!RSETestsPlugin.isTestCaseEnabled("FileServiceTest.testCreateFile")) return; //$NON-NLS-1$
 		
 		createSourceTarFiles();
@@ -1186,55 +1041,45 @@ public class FileServiceArchiveTestDStore extends FileServiceArchiveTest {
 		IRemoteFile folder1 = createFileOrFolder(tempDirPath, folderName, true);
 		assertTrue(folder1 != null);
 		
-		try
-		{
-			//Get several of its fifth level children, and them into the folder.
-			IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
-			assertTrue(firstLevelChild != null);
-			IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
-			assertTrue(secondLevelChild != null);
-			IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
-			assertTrue(thirdLevelChild != null);
-			IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
-			assertTrue(fourthLevelChild != null);
-			
-			IRemoteFile[] fifLevelChildrenToCopy = new IRemoteFile[3];
-			
-			String firstToCopyName = "client"; 
-			fifLevelChildrenToCopy[0] = (IRemoteFile)getChildFromFolder(fourthLevelChild, firstToCopyName);
-			assertTrue(fifLevelChildrenToCopy[0] != null);
-			String secondToCopyName = "miners"; 
-			fifLevelChildrenToCopy[1] = (IRemoteFile)getChildFromFolder(fourthLevelChild, secondToCopyName);
-			assertTrue(fifLevelChildrenToCopy[1] != null);
-			String thirdToCopyName = "Activator.java"; 
-			fifLevelChildrenToCopy[2] = (IRemoteFile)getChildFromFolder(fourthLevelChild, thirdToCopyName);
-			assertTrue(fifLevelChildrenToCopy[2] != null);
-			
-			
-			fss.copyBatch(fifLevelChildrenToCopy, folder1, mon);
-			
-			Object copiedVirtualFolder1 = getChildFromFolder(folder1, firstToCopyName);
-			assertTrue(copiedVirtualFolder1 != null);
-			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);
-			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);
-		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
+		//Get several of its fifth level children, and them into the folder.
+		IRemoteFile firstLevelChild = (IRemoteFile)getChildFromFolder(sourceTarFile, "org");
+		assertTrue(firstLevelChild != null);
+		IRemoteFile secondLevelChild = (IRemoteFile)getChildFromFolder(firstLevelChild, "eclipse");
+		assertTrue(secondLevelChild != null);
+		IRemoteFile thirdLevelChild = (IRemoteFile)getChildFromFolder(secondLevelChild, "dstore");
+		assertTrue(thirdLevelChild != null);
+		IRemoteFile fourthLevelChild = (IRemoteFile)getChildFromFolder(thirdLevelChild, "core");
+		assertTrue(fourthLevelChild != null);
 		
-		return;
+		IRemoteFile[] fifLevelChildrenToCopy = new IRemoteFile[3];
 		
+		String firstToCopyName = "client"; 
+		fifLevelChildrenToCopy[0] = (IRemoteFile)getChildFromFolder(fourthLevelChild, firstToCopyName);
+		assertTrue(fifLevelChildrenToCopy[0] != null);
+		String secondToCopyName = "miners"; 
+		fifLevelChildrenToCopy[1] = (IRemoteFile)getChildFromFolder(fourthLevelChild, secondToCopyName);
+		assertTrue(fifLevelChildrenToCopy[1] != null);
+		String thirdToCopyName = "Activator.java"; 
+		fifLevelChildrenToCopy[2] = (IRemoteFile)getChildFromFolder(fourthLevelChild, thirdToCopyName);
+		assertTrue(fifLevelChildrenToCopy[2] != null);
+		
+		
+		fss.copyBatch(fifLevelChildrenToCopy, folder1, mon);
+		
+		Object copiedVirtualFolder1 = getChildFromFolder(folder1, firstToCopyName);
+		assertTrue(copiedVirtualFolder1 != null);
+		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);
+		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);
 	}
 
 }
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 7ce6c26ae48..5ccb1481648 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
@@ -28,6 +28,9 @@ import org.eclipse.rse.ui.RSEUIPlugin;
 
 public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest {
 
+	private boolean fPreference_ALERT_SSL;
+	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$
@@ -55,34 +58,24 @@ public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest
 		return suite;
 	}
 	
-	public void setUp() {
+	public void setUp() throws Exception {
+		super.setUp();
 		
 		//We need to delay if it is first case run after a workspace startup
 		SYSTEM_TYPE_ID = IRSESystemType.SYSTEMTYPE_WINDOWS_ID;
 		SYSTEM_ADDRESS = "LOCALHOST";
 		SYSTEM_NAME = "LOCALHOST_ds";
 		
-		//We need to delay if it is first case run after a workspace startup
-		if (!classBeenRunBefore)
-		{
-			IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
-			
-			//We need to setDefault first in order to set the value of a preference.  
-			store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
-			store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
-			store.setValue(ISystemPreferencesConstants.ALERT_SSL, false);
-			store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, false);
-			try
-			{
-				System.out.println("need to sleep");
-				Thread.sleep(500);
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-			classBeenRunBefore = true;
-		}
+		//Ensure that the SSL acknowledge dialog does not show up. 
+		//We need to setDefault first in order to set the value of a preference.  
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		store.setDefault(ISystemPreferencesConstants.ALERT_SSL, ISystemPreferencesConstants.DEFAULT_ALERT_SSL);
+		store.setDefault(ISystemPreferencesConstants.ALERT_NONSSL, ISystemPreferencesConstants.DEFAULT_ALERT_NON_SSL);
+		fPreference_ALERT_SSL = store.getBoolean(ISystemPreferencesConstants.ALERT_SSL);
+		fPreference_ALERT_NONSSL = store.getBoolean(ISystemPreferencesConstants.ALERT_NONSSL);
+		store.setValue(ISystemPreferencesConstants.ALERT_SSL, false);
+		store.setValue(ISystemPreferencesConstants.ALERT_NONSSL, false);
+
 		IHost dstoreHost = getRemoteSystemConnection(SYSTEM_TYPE_ID, SYSTEM_ADDRESS, SYSTEM_NAME, "", "");
 		assertTrue(dstoreHost != null);
 		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
@@ -153,12 +146,11 @@ public class FileServiceArchiveTestDStoreWindows extends FileServiceArchiveTest
 		}
 	}
 	
-	public void tearDown() {
-		try {
-			fss.delete(tempDir, mon);
-		} catch(SystemMessageException msg) {
-			assertFalse("Exception: "+msg.getLocalizedMessage(), true); //$NON-NLS-1$
-		}
+	public void tearDown() throws Exception {
+		IPreferenceStore store = RSEUIPlugin.getDefault().getPreferenceStore();
+		store.setValue(ISystemPreferencesConstants.ALERT_SSL, fPreference_ALERT_SSL);
+		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 1bbb53b9646..f193fc83e78 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
@@ -25,13 +25,22 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.rse.core.RSECorePlugin;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.core.model.ISystemRegistry;
+import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.archiveutils.ArchiveHandlerManager;
+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;
 import org.eclipse.rse.subsystems.files.core.subsystems.IVirtualRemoteFile;
 import org.eclipse.rse.tests.core.connection.RSEBaseConnectionTestCase;
 
+/**
+ * Base class for file subsystem / file service unit tests.
+ * Contains helper methods for test environment setup.
+ */
 public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
 
 	protected IFileServiceSubSystem fss;
@@ -40,11 +49,43 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
 	protected IRemoteFile tempDir;
 	protected String tempDirPath;
 	protected IProgressMonitor mon = new NullProgressMonitor();
-	protected static boolean classBeenRunBefore = false;
 	
 	public static int TYPE_FILE = 0;
 	public static int TYPE_FOLDER = 1;
 	
+	public void setUp() throws Exception {
+		super.setUp();
+
+		IHost localHost = getLocalSystemConnection();
+		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); 
+		ISubSystem[] ss = sr.getServiceSubSystems(localHost, IFileService.class);
+		for (int i=0; i<ss.length; i++) {
+			if (ss[i] instanceof IFileServiceSubSystem) {
+				fss = (IFileServiceSubSystem)ss[i];
+				fs = fss.getFileService();
+			}
+		}
+		localFss = fss;  //Used for creating test source data.
+		assertNotNull(localFss);
+		
+		//Create a temporary directory in My Home
+		IRemoteFile homeDirectory = fss.getRemoteFileObject(".", mon);
+		String baseFolderName = "rsetest";
+		String homeFolderName = homeDirectory.getAbsolutePath();
+		String testFolderName = FileServiceHelper.getRandomLocation(fss, homeFolderName, baseFolderName, mon);
+		tempDir = createFileOrFolder(homeFolderName, testFolderName, true);
+		tempDirPath = tempDir.getAbsolutePath();
+	}
+	
+	public void tearDown() throws Exception {
+		try {
+			fss.delete(tempDir, mon);
+		} catch(SystemMessageException msg) {
+			//ensure that super.tearDown() can run
+			System.err.println("Exception on tearDown: "+msg.getLocalizedMessage()); //$NON-NLS-1$
+		}
+		super.tearDown();
+	}
 	
 	public boolean isWindows() {
 		return fss.getHost().getSystemType().isWindows(); 
@@ -61,133 +102,100 @@ public class FileServiceBaseTest extends RSEBaseConnectionTestCase {
 	}
 	
 	
-	public IRemoteFile copySourceFileOrFolder(String sourceFullName, String sourceName, String targetFolderFullName)
+	public IRemoteFile copySourceFileOrFolder(String sourceFullName, String sourceName, String targetFolderFullName) throws Exception
 	{
 		boolean ok = false;
 		IRemoteFile result = null;
-		try
+		IRemoteFile originalTargetArchiveFile = fss.getRemoteFileObject(sourceFullName, mon); 
+		IRemoteFile targetFolder = fss.getRemoteFileObject(targetFolderFullName, mon);
+		ok = fss.copy(originalTargetArchiveFile, targetFolder, sourceName, mon);
+		if (ok)
 		{
-			IRemoteFile originalTargetArchiveFile = fss.getRemoteFileObject(sourceFullName, mon); 
-			IRemoteFile targetFolder = fss.getRemoteFileObject(targetFolderFullName, mon);
-			ok = fss.copy(originalTargetArchiveFile, targetFolder, sourceName, mon);
-			if (ok)
-			{
-				//copy is successful
-				result = fss.getRemoteFileObject(getNewAbsoluteName(targetFolder, sourceName), mon);
-			}
-			//Need to call resolveFilterString of the parent to make sure the newly copied 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);
-		}
-		catch(Exception e)
-		{
-			return null;
+			//copy is successful
+			result = fss.getRemoteFileObject(getNewAbsoluteName(targetFolder, sourceName), mon);
 		}
+		//Need to call resolveFilterString of the parent to make sure the newly copied 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);
 		return result;
 	}
 	
-	public IRemoteFile createFileOrFolder(String targetFolderName, String fileOrFolderName, boolean isFolder)
+	public IRemoteFile createFileOrFolder(String targetFolderName, String fileOrFolderName, boolean isFolder) throws Exception
 	{
 		IRemoteFile result = null;
-		try
+		System.out.println("createFileOrFolder: targetFolderName is " + targetFolderName);
+		IRemoteFile targetFolder = fss.getRemoteFileObject(targetFolderName, mon);
+		//fss.resolveFilterString(targetFolder, null, mon);
+		String fileOrFolderAbsName = getNewAbsoluteName(targetFolder, fileOrFolderName);
+		IRemoteFile newFileOrFolderPath = fss.getRemoteFileObject(fileOrFolderAbsName, mon); 
+		if (isFolder)
 		{
-			System.out.println("targetFolderName is " + targetFolderName);
-			if (fss == null)
-			{
-				System.out.println("fss is null ");
-			}
-			IRemoteFile targetFolder = fss.getRemoteFileObject(targetFolderName, mon);
-			//fss.resolveFilterString(targetFolder, null, mon);
-			String fileOrFolderAbsName = getNewAbsoluteName(targetFolder, fileOrFolderName);
-			IRemoteFile newFileOrFolderPath = fss.getRemoteFileObject(fileOrFolderAbsName, mon); 
-			if (isFolder)
-			{
-				result = fss.createFolder(newFileOrFolderPath, mon);
-			}
-			else
-			{
-				result = fss.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);
+			result = fss.createFolder(newFileOrFolderPath, mon);
 		}
-		catch (Exception e)
+		else
 		{
-			e.printStackTrace();
-			return null;
+			result = fss.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);
 		return result;
 	}
 	
-	public Object getChildFromFolder(IRemoteFile folderToCheck, String childName)
+	public Object getChildFromFolder(IRemoteFile folderToCheck, String childName) throws Exception
 	{
 		//then check the result of copy
 		Object[] children = null;
 		Object foundChild = null;
-		try
+		children = fss.resolveFilterString(folderToCheck, null, mon);
+		for (int i=0; i<children.length; i++)
 		{
-			children = fss.resolveFilterString(folderToCheck, null, mon);
-			for (int i=0; i<children.length; i++)
+			String thisName = ((IRemoteFile)children[i]).getName();
+			if (thisName.equals(childName))
 			{
-				String thisName = ((IRemoteFile)children[i]).getName();
-				if (thisName.equals(childName))
-				{
-					foundChild = children[i];
-				}
+				foundChild = children[i];
 			}
 		}
-		catch (Exception e)
-		{
-			foundChild = null;
-		}
 		return foundChild;
 	}
 	
-	public void checkFolderContents(IRemoteFile folderToCheck, String[] names, int[] types)
+	public void checkFolderContents(IRemoteFile folderToCheck, String[] names, int[] types) throws Exception
 	{
-		try
+		//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);
+		System.out.println("verifying the contents for folder: " + folderToCheck.getAbsolutePath());
+		Object[] children = fss.resolveFilterString(folderToCheck, null, mon);
+		//Make sure the children array includes the copied folder.
+		HashMap childrenMap = new HashMap();
+	    //Add children name into the map
+		for (int i=0; i<children.length; i++)
 		{
-			//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);
-			System.out.println("verifying the contents for folder: " + folderToCheck.getAbsolutePath());
-			Object[] children = fss.resolveFilterString(folderToCheck, null, mon);
-			//Make sure the children array includes the copied folder.
-			HashMap childrenMap = new HashMap();
-		    //Add children name into the map
-			for (int i=0; i<children.length; i++)
+			String thisName = ((IRemoteFile)children[i]).getName();
+			childrenMap.put(thisName, children[i]);
+		}
+		//Check contents are in the array list
+		for (int i=0; i<names.length; i++)
+		{
+			IRemoteFile found = (IRemoteFile)(childrenMap.get(names[i]));
+			assertTrue("Could not find " + names[i], found != null);
+			assertTrue(found.exists());
+			if (types != null && types.length != 0)
 			{
-				String thisName = ((IRemoteFile)children[i]).getName();
-				childrenMap.put(thisName, children[i]);
-			}
-			//Check contents are in the array list
-			for (int i=0; i<names.length; i++)
-			{
-				IRemoteFile found = (IRemoteFile)(childrenMap.get(names[i]));
-				assertTrue("Could not find " + names[i], found != null);
-				assertTrue(found.exists());
-				if (types != null && types.length != 0)
+				//If input array of types, we also need to check if the type is correct.
+				if (types[i] == TYPE_FILE)
 				{
-					//If input array of types, we also need to check if the type is correct.
-					if (types[i] == TYPE_FILE)
-					{
-						assertTrue(found.isFile());
-					}
-					else if (types[i] == TYPE_FOLDER)
-					{
-						assertTrue(found.isDirectory());
-					}
+					assertTrue(found.isFile());
+				}
+				else if (types[i] == TYPE_FOLDER)
+				{
+					assertTrue(found.isDirectory());
 				}
 			}
 		}
-		catch (Exception e)
-		{
-			fail("Problem encountered: " + e.getStackTrace().toString());
-		}
 	}
 	
 	protected static String getNewAbsoluteName(IRemoteFile parentFolder, String newName)
diff --git a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java
index 3ffcaa3e75e..c975fbbd688 100644
--- a/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java
+++ b/rse/tests/org.eclipse.rse.tests/src/org/eclipse/rse/tests/subsystems/files/FileServiceTest.java
@@ -18,9 +18,9 @@ import java.io.IOException;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemStartHere;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
 import org.eclipse.rse.services.files.IFileService;
@@ -37,9 +37,10 @@ public class FileServiceTest extends RSEBaseConnectionTestCase {
 	private String tempDirPath;
 	private IProgressMonitor mon = new NullProgressMonitor();
 	
-	public void setUp() {
+	public void setUp() throws Exception {
+		super.setUp();
 		IHost localHost = getLocalSystemConnection();
-		ISystemRegistry sr = SystemStartHere.getSystemRegistry(); 
+		ISystemRegistry sr = RSECorePlugin.getTheSystemRegistry(); 
 		ISubSystem[] ss = sr.getServiceSubSystems(localHost, IFileService.class);
 		for (int i=0; i<ss.length; i++) {
 			if (ss[i] instanceof IFileServiceSubSystem) {
@@ -57,12 +58,14 @@ public class FileServiceTest extends RSEBaseConnectionTestCase {
 		}
 	}
 	
-	public void tearDown() {
+	public void tearDown() throws Exception {
 		try {
 			fs.delete(tempDir.getParent(), tempDir.getName(), mon);
 		} catch(SystemMessageException msg) {
-			assertFalse("Exception: "+msg.getLocalizedMessage(), true); //$NON-NLS-1$
+			//ensure that super.tearDown() can run
+			System.err.println("Exception on tearDown: "+msg.getLocalizedMessage()); //$NON-NLS-1$
 		}
+		super.tearDown();
 	}
 	
 	public boolean isWindows() {
diff --git a/rse/tests/org.eclipse.rse.tests/teamConfig/RSE Combined Test Suite.launch b/rse/tests/org.eclipse.rse.tests/teamConfig/RSE Combined Test Suite.launch
index 3fb03cb09b7..06886c4a14c 100644
--- a/rse/tests/org.eclipse.rse.tests/teamConfig/RSE Combined Test Suite.launch	
+++ b/rse/tests/org.eclipse.rse.tests/teamConfig/RSE Combined Test Suite.launch	
@@ -1,36 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="tracing" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="checked" value="[NONE]"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-test-workspace"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.rse.tests.RSECombinedTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug -clean"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.rse.tests"/>
 <booleanAttribute key="askclear" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.rse.tests"/>
-</listAttribute>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
 <booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-test-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.rse.tests/src/org/eclipse/rse/tests/RSECombinedTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.rse.tests.RSECombinedTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -debug -clean"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.rse.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -esa -Dcom.sun.management.jmxremote"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
+<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
 </launchConfiguration>