Index: lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
===================================================================
diff -u -r0b17741e05a94c4dc20f6990b5ab84ef672605fa -r0e8d998fff926bc26db7127c07cf0f26563e39cb
--- lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java	(.../BranchingTests.java)	(revision 0b17741e05a94c4dc20f6990b5ab84ef672605fa)
+++ lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java	(.../BranchingTests.java)	(revision 0e8d998fff926bc26db7127c07cf0f26563e39cb)
@@ -55,12 +55,14 @@
 public class BranchingTests {
 
 	// Branching constants 
-	private static final String BRANCHING_TYPE_INSTRUCTOR = "chosen";
-	private static final String BRANCHING_TYPE_GROUP = "group";
-	private static final String BRANCHING_TYPE_LEARNER_OUTPUT = "tool";
-	private static final String BRANCHING_TYPE_LEARNER_CHOICE = "optional";
-	private static final String randomInt = LamsUtil.randInt(0, 9999);
+	public static final String BRANCHING_TYPE_INSTRUCTOR = "chosen";
+	public static final String BRANCHING_TYPE_GROUP = "group";
+	public static final String BRANCHING_TYPE_LEARNER_OUTPUT = "tool";
+	public static final String BRANCHING_TYPE_LEARNER_CHOICE = "optional";
 	
+	
+	private static final String RANDOM_INT = LamsUtil.randInt(0, 9999);
+	
 	// Learner choice constants
 	private static final String MAXNUMBERSEQUENCES = "2";
 	private static final String MINNUMBERSEQUENCES = "1";
@@ -74,8 +76,8 @@
 	
 
 	
-	private String randomDesignName = "Design-" + randomInt;
-	private String randomBranchingName = "Branch" + randomInt;
+	private String randomDesignName = "Design-" + RANDOM_INT;
+	private String randomBranchingName = "Branch" + RANDOM_INT;
 
 	private LoginPage onLogin;
 	private IndexPage index;
@@ -97,7 +99,7 @@
 
 	@AfterClass
 	public void afterClass() {
-		driver.quit();
+		//driver.quit();
 	}
 
 	/**
@@ -138,8 +140,7 @@
 
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		// Assert that all of them are in the design
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.NOTICEBOARD_TITLE), 
 				"The title " + AuthorConstants.NOTICEBOARD_TITLE + " was not found as an activity in the design");
@@ -159,8 +160,7 @@
 
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCHING_START_TITLE), 
 				"The title " + AuthorConstants.BRANCHING_START_TITLE + " was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCH_END_TITLE), 
@@ -175,8 +175,6 @@
 		// the activities better on the screen)
 		Point startBranchingPosition = fla.getActivityLocation(AuthorConstants.BRANCHING_START_TITLE);
 
-		System.out.println("Branching start position:" + startBranchingPosition);
-
 		fla.dragActivityToCanvasPosition(AuthorConstants.PIXLR_TITLE, 
 				(startBranchingPosition.x + 50), (startBranchingPosition.y - 100));
 
@@ -189,8 +187,7 @@
 		/// Assertions
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.PIXLR_TITLE), 
 				"The title " + AuthorConstants.PIXLR_TITLE + " was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.COMMON_CARTRIDGE_TITLE), 
@@ -215,8 +212,7 @@
 		/// Assertions 
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains("Branch 1"), 
 				"Branch 1 was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains("Branch 2"), 
@@ -351,7 +347,7 @@
 	@Test(dependsOnMethods="saveDesign")
 	public void clearCanvas() {
 		
-		fla.newDesign();
+		fla.newDesign().getAlertText();
 
 	}
 
@@ -403,9 +399,7 @@
 		// Get position for branching start point (we'll use this to present 
 		// the activities better on the screen)
 		Point startBranchingPosition = fla.getActivityLocation(AuthorConstants.BRANCHING_START_TITLE);
-
-		System.out.println("Branching start position:" + startBranchingPosition);
-
+		
 		fla
 		.dragActivityToCanvasPosition(AuthorConstants.FORUM_TITLE, 
 				(startBranchingPosition.x + 50), (startBranchingPosition.y - 200))
@@ -468,8 +462,7 @@
 		/// Assertions now
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCHING_START_TITLE), 
 				"The title " + AuthorConstants.BRANCHING_START_TITLE + " was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCH_END_TITLE), 
@@ -602,8 +595,7 @@
 		
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCHING_START_TITLE), 
 				"The title " + AuthorConstants.BRANCHING_START_TITLE + " was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCH_END_TITLE), 
@@ -742,8 +734,7 @@
 		
 		// Now get all the activity titles
 		List<String> allActivityTitles = fla.getAllActivityNames();
-		System.out.println("All activities:" + allActivityTitles);
-
+		
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCHING_START_TITLE), 
 				"The title " + AuthorConstants.BRANCHING_START_TITLE + " was not found as an activity in the design");
 		Assert.assertTrue(allActivityTitles.contains(AuthorConstants.BRANCH_END_TITLE), 
@@ -835,6 +826,8 @@
 		Assert.assertTrue(assertAllMappings.contains(conditionZeroRange + " matches " + branchTwo), 
 				"Error " + conditionZeroRange + " doesn't match with " + branchTwo);
 		
+		clearCanvas();
+		
 	}
 	
 }
Index: lams_tests/tests/org/lamsfoundation/lams/author/GatesTests.java
===================================================================
diff -u -rba4ff235b722eae45c0b93a138bd60f2c43ce37d -r0e8d998fff926bc26db7127c07cf0f26563e39cb
--- lams_tests/tests/org/lamsfoundation/lams/author/GatesTests.java	(.../GatesTests.java)	(revision ba4ff235b722eae45c0b93a138bd60f2c43ce37d)
+++ lams_tests/tests/org/lamsfoundation/lams/author/GatesTests.java	(.../GatesTests.java)	(revision 0e8d998fff926bc26db7127c07cf0f26563e39cb)
@@ -66,9 +66,9 @@
 	private static final String GATE_TYPE_PERMISSION = "permission";
 	
 	
-	private static final String randomInt = LamsUtil.randInt(0, 9999);
+	private static final String RANDOM_INT = LamsUtil.randInt(0, 9999);
 
-	private String randomDesignName = "Design-" + randomInt;
+	private String randomDesignName = "Design-" + RANDOM_INT;
 	private int randomInteger = Integer.parseInt(LamsUtil.randInt(0, 5));
 	
 	private LoginPage onLogin;
@@ -91,7 +91,7 @@
 
 	@AfterClass
 	public void afterClass() {
-		// driver.quit();
+		driver.quit();
 	}