Index: lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java
===================================================================
diff -u -rdd6a6fcd79ef385c6d0eb01a15f5f6b24712c25a -r53fc2fde004cbbd2d6dac00c57cb27b07837da63
--- lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java	(.../ClassTab.java)	(revision dd6a6fcd79ef385c6d0eb01a15f5f6b24712c25a)
+++ lams_tests/tests/org/lamsfoundation/lams/pages/monitor/addlesson/ClassTab.java	(.../ClassTab.java)	(revision 53fc2fde004cbbd2d6dac00c57cb27b07837da63)
@@ -30,6 +30,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.FindBys;
 import org.openqa.selenium.support.PageFactory;
 
 public class ClassTab extends AbstractPage {
@@ -56,9 +57,6 @@
 	@FindBy(id = "selected-monitors")
 	private WebElement selectedMonitors;
 
-	@FindBy(id = "unselected-learners")
-	private WebElement unselectedLearners;
-
 	@FindBy(id = "learnerMoveToRight")
 	private WebElement learnerMoveToRight;
 
@@ -68,6 +66,13 @@
 	@FindBy(id = "selected-learners")
 	private WebElement selectedLearners;
 
+	@FindBys({
+		@FindBy(id = "unselected-learners"), 
+		@FindBy(id = "div")
+	})
+	private List<WebElement> allUnselectedLearners;
+
+	
 	public ClassTab(WebDriver driver) {
 		super(driver);
 		
@@ -104,7 +109,7 @@
 	
 	public ClassTab addOneLearnerToLesson() {
 		
-		List<WebElement> availableLearners = unselectedLearners.findElements(By.tagName("div"));
+		List<WebElement> availableLearners = allUnselectedLearners;
 		
 		int randomLearner = Integer.parseInt(LamsUtil.randInt(1, availableLearners.size()-1));
 	
@@ -132,8 +137,9 @@
 	}
 	
 	public int getNumberUnselectedLearners() {
-
-		return unselectedLearners.findElements(By.tagName("div")).size();
+		
+		return allUnselectedLearners.size();
+		
 	}