--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/AllTests.java	Wed Aug 12 10:16:47 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/AllTests.java	Wed Aug 12 12:06:59 2009 -0500
@@ -27,7 +27,6 @@
 		//$JUnit-BEGIN$
 		suite.addTestSuite(RegistryTest.class);
 		suite.addTestSuite(SerializationTest.class);
-		suite.addTestSuite(ServiceTest.class);
 		suite.addTestSuite(FilterTest.class);
 		suite.addTestSuite(TCPIPConnectionTypeTests.class);
 		//$JUnit-END$

--- a/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/RegistryTest.java	Wed Aug 12 10:16:47 2009 -0500
+++ b/connectivity/com.nokia.carbide.remoteConnections.tests/src/com/nokia/carbide/remoteconnections/tests/RegistryTest.java	Wed Aug 12 12:06:59 2009 -0500
@@ -62,8 +62,7 @@
 		assertEquals(RandomCycleService.class.getName(), service.getIdentifier());
 		
 		Collection<String> ctids = Registry.instance().getCompatibleConnectionTypeIds(service);
-		String id = ctids.iterator().next();
-		assertEquals(ct.getIdentifier(), id);
+		assertTrue(ctids.contains(ct.getIdentifier()));
 	}
 	
 	public void testStoreAndLoadConnections() {