Index: lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java,v
diff -u -r1.4 -r1.5
--- lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java	22 Oct 2014 19:31:07 -0000	1.4
+++ lams_tests/tests/org/lamsfoundation/lams/author/BranchingTests.java	28 Oct 2014 12:58:40 -0000	1.5
@@ -34,6 +34,7 @@
 import org.openqa.selenium.Point;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.interactions.SendKeysAction;
 import org.openqa.selenium.support.PageFactory;
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
@@ -830,5 +831,64 @@
 		
 	}
 	
+	@Test(dependsOnMethods="reOpenAndVerifyToolOutputDesign")
+	public void createBranchingWithinBranching() {
+		
+		String firstBranching = "Branching1";
+		String secondBranching = "Branching2";
+		
+		// Drop activities in canvas
+		fla
+		 .dragActivityToCanvasPosition(AuthorConstants.NOTICEBOARD_TITLE, 200, 150);
+
+		// draw branching
+		fla.dragBranchToCanvas();
+
+		// draw transition
+		fla.drawTransitionFromTo(AuthorConstants.NOTICEBOARD_TITLE, AuthorConstants.BRANCHING_START_TITLE);
+		
+		// rename branching
+		fla.branchingProperties(AuthorConstants.BRANCHING_TITLE)
+		.setBranchingType(BRANCHING_TYPE_INSTRUCTOR)
+		.setBranchingTitle(firstBranching);
+		
+		fla.dragActivityToCanvasPosition(AuthorConstants.CHAT_TITLE, 300, 250)
+		.dragActivityToCanvasPosition(AuthorConstants.FORUM_TITLE, 450, 450);
+		
+		fla.drawTransitionFromTo(firstBranching + " start", AuthorConstants.CHAT_TITLE)
+		.drawTransitionFromTo(firstBranching + " start", AuthorConstants.FORUM_TITLE);
+		
+		fla.dragBranchesToCanvasPosition(400, 580)
+		.branchingProperties(AuthorConstants.BRANCHING_TITLE)
+		.setBranchingTitle(secondBranching)
+		.setBranchingType(BRANCHING_TYPE_INSTRUCTOR);
+		
+		fla.dragActivityToCanvasPosition(AuthorConstants.GMAP_TITLE, 300, 100)
+		.dragActivityToCanvasPosition(AuthorConstants.IMAGE_GALLERY_TITLE, 400, 350);
+		
+		fla.drawTransitionFromTo(secondBranching + " start", AuthorConstants.GMAP_TITLE)
+		.drawTransitionFromTo(secondBranching + " start", AuthorConstants.IMAGE_GALLERY_TITLE);
+		
+		fla.drawTransitionFromTo(AuthorConstants.FORUM_TITLE, secondBranching + " start")
+		.drawTransitionFromTo(AuthorConstants.CHAT_TITLE, firstBranching + " end")
+		.drawTransitionFromTo(AuthorConstants.IMAGE_GALLERY_TITLE, secondBranching + " end")
+		.drawTransitionFromTo(AuthorConstants.GMAP_TITLE, secondBranching + " end"); 
+		
+		fla.arrangeDesign();
+		
+	}
+	
+	/**
+	 * Gives a name and saves the designs 
+	 */
+	@Test(dependsOnMethods="createBranchingWithinBranching")
+	public void nameAndSaveDesignBranchingWithinBranching() {
+
+		String saveResult = fla.saveAsDesign(randomDesignName + "- Branching within Branching");
+
+		Assert.assertTrue(saveResult.contains(AuthorConstants.SAVE_SEQUENCE_SUCCESS_MSG), 
+				"Save error. Returned: " + saveResult);
+	}
+	
 }
 
Index: lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java,v
diff -u -r1.7 -r1.8
--- lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java	22 Oct 2014 19:32:14 -0000	1.7
+++ lams_tests/tests/org/lamsfoundation/lams/pages/author/FLAPage.java	28 Oct 2014 12:58:40 -0000	1.8
@@ -908,13 +908,26 @@
 	 */
 	public FLAPage dragBranchToCanvas() {
 		
+		dragBranchesToCanvasPosition(200, 280);
+		
+		return PageFactory.initElements(driver, FLAPage.class);
+	}
+	
+	/**
+	 * Drags a branching activity into the canvas in a particular canvas position
+	 * @param x 
+	 * @param y
+	 * @return {@link FLAPage}
+	 */
+	public FLAPage dragBranchesToCanvasPosition(int x, int y) {
+
 		flowDropButton.click();
 		branchingButton.click();
 		
 		// Prepare the dragAndDrop action
 		Actions builder = new Actions(driver);  // Configure the Action
 		Action dropBranch = builder
-				.moveToElement(canvas, 200, 280)
+				.moveToElement(canvas, x, y)
 				.click()
 				.moveByOffset(600, 0)
 				.click()
@@ -923,9 +936,14 @@
 		// Execute the Action
 		dropBranch.perform();
 		
+		
+
+		
+		
 		return PageFactory.initElements(driver, FLAPage.class);
 	}
 	
+	
 	/**
 	 * Drags a optional activity into the canvas 
 	 *