--- a/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/TestsPlugin.java	Fri Jun 11 11:35:13 2010 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine.tests/src/com/nokia/carbide/cpp/epoc/engine/tests/TestsPlugin.java	Fri Jun 11 12:09:52 2010 -0500
@@ -16,16 +16,21 @@
 */
 package com.nokia.carbide.cpp.epoc.engine.tests;
 
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
-import com.nokia.carbide.cpp.sdk.core.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;
 
-import java.util.*;
-
-import junit.framework.TestCase;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
+import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
+import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
 
 /**
  * The main plugin class to be used in the desktop.
@@ -72,17 +77,11 @@
 		for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) {
 			ISBSv1BuildInfo sbsv1BuildInfo = (ISBSv1BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER);
 			ISBSv2BuildInfo sbsv2BuildInfo = (ISBSv2BuildInfo)sdk.getBuildInfo(ISymbianBuilderID.SBSV2_BUILDER);
-			List<ISymbianBuildContext> contexts;
-			if (sbsv1BuildInfo != null) {
-				contexts = sbsv1BuildInfo.getAllBuildConfigurations(sdk);
-				if (contexts.size() > 0) {
-					return contexts.subList(0, Math.min(contexts.size(), 8));
-				}
-			} else if (sbsv2BuildInfo != null) {
-				contexts = sbsv2BuildInfo.getAllBuildConfigurations(sdk);
-				if (contexts.size() > 0) {
-					return contexts.subList(0, Math.min(contexts.size(), 8));
-				}
+			List<ISymbianBuildContext> contexts = new ArrayList<ISymbianBuildContext>();
+			contexts.addAll(sbsv1BuildInfo.getAllBuildConfigurations());
+			contexts.addAll(sbsv2BuildInfo.getAllBuildConfigurations());
+			if (contexts.size() > 0) {
+				return contexts.subList(0, Math.min(contexts.size(), 8));
 			}
 		}
 		TestCase.fail("No installed SDKs provide build configurations");