Index: lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
===================================================================
diff -u -re3c917a58dd420e2e96f0a45bd85fb80806c92ed -rb7c9e73e8708ec349c247443d5b1890aa356be0c
--- lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java	(.../AbstractSeleniumTestCase.java)	(revision e3c917a58dd420e2e96f0a45bd85fb80806c92ed)
+++ lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java	(.../AbstractSeleniumTestCase.java)	(revision b7c9e73e8708ec349c247443d5b1890aa356be0c)
@@ -221,8 +221,10 @@
 		+ "servlet/authoring/storeLearningDesignDetails";
 	String designDetails = constructWddxDesign(contentDetails);
 	//callback function is aimed to let Selenium wait till StoreLDServlet finishes its work
-	selenium.runScript("$.post(\"" + storeLearningDesignUrl + "\", " + "\"" + designDetails + "\", "
-		+ "function(data){ return data; }" + ");");
+	selenium.runScript("$.post(\"" + storeLearningDesignUrl + "\", " +
+			"\"" + designDetails + "\", " +
+			"function(data){ return data; }" +
+			");");
 	selenium.selectWindow(null);
     }
 
@@ -261,7 +263,7 @@
 	assertTrue(flexSelenium.getFlexEnabled("startButton").equals("true"));
 
 	flexSelenium.flexSelectIndex("workspaceTree", String.valueOf(count));
-	//		flexSelenium.flexType("resourceName_txi", "bueno");
+	// flexSelenium.flexType("resourceName_txi", "bueno");
 	flexSelenium.flexClick("startButton");
 	Thread.sleep(5000);
 	assertTrue("Assertion failed. Lesson has *not* been created",
@@ -500,92 +502,59 @@
 	    }
 	}
 
-	String design = "<wddxPacket version='1.0'>" + "<header />" + "<data>" + "<struct>"
-		+ "<var name='competences'><array length='0' /></var>"
-		+ "<var name='branchMappings'><array length='0' /></var>"
-		+ "<var name='groupings'><array length='0' /></var>"
-		+ "<var name='transitions'><array length='0' /></var>" + "<var name='activities'>"
-		+ "<array length='1'>" + "<struct>" + "<var name='competenceMappings'><array length='0' /></var>"
-		+ "<var name='gradebookToolOutputDefinitionName'><string>string_null_value</string></var>"
-		+ "<var name='extLmsId'><string>string_null_value</string></var>" + "<var name='toolID'><number>"
-		+ tool.getToolId()
-		+ "</number></var>"
-		+ "<var name='toolContentID'><number>"
-		+ contentDetails.get("toolContentID")
-		+ "</number></var>"
-		+ "<var name='toolSignature'><string>"
-		+ tool.getToolSignature()
-		+ "</string></var>"
-		+ "<var name='toolDisplayName'><string>"
-		+ tool.getToolDisplayName()
-		+ "</string></var>"
-		+ "<var name='helpURL'><string>"
-		+ tool.getHelpUrl()
-		+ "</string></var>"
-		+ "<var name='authoringURL'><string>"
-		+ tool.getAuthorUrl()
-		+ "</string></var>"
-		+ "<var name='stopAfterActivity'><boolean value='false' /></var>"
-		+ "<var name='groupingSupportType'><number>"
-		+ templateActivity.getGroupingSupportType()
-		+ "</number></var>"
-		+ "<var name='createDateTime'><dateTime>2009-6-12T1:24:50+3:0</dateTime></var>"
-		+ "<var name='defineLater'><boolean value='false' /></var>"
-		+ "<var name='runOffline'><boolean value='false' /></var>"
-		+ "<var name='applyGrouping'><boolean value='false' /></var>"
-		+ "<var name='parentActivityID'><number>-111111</number></var>"
-		+ "<var name='parentUIID'><number>-111111</number></var>"
-		+ "<var name='libraryActivityUIImage'><string>"
-		+ templateActivity.getLibraryActivityUiImage()
-		+ "</string></var>"
-		+ "<var name='xCoord'><number>124</number></var>"
-		+ "<var name='yCoord'><number>132</number></var>"
-		+ "<var name='helpText'><string>"
-		+ templateActivity.getHelpText()
-		+ "</string></var>"
-		+ "<var name='description'><string>"
-		+ templateActivity.getDescription()
-		+ "</string></var>"
-		+ "<var name='activityTitle'><string>"
-		+ templateActivity.getTitle()
-		+ "</string></var>"
-		+ "<var name='learningLibraryID'><number>"
-		+ templateActivity.getLearningLibrary().getLearningLibraryId()
-		+ "</number></var>"
-		+
-		//works with activityUIID=1 but may be we should generate unique one.
-		"<var name='activityUIID'><number>1</number></var>"
-		+ "<var name='activityCategoryID'><number>"
-		+ templateActivity.getActivityCategoryID()
-		+ "</number></var>"
-		+ "<var name='activityID'><number>"
-		+ templateActivity.getActivityId()
-		+ "</number></var>"
-		+ "<var name='activityTypeID'><number>"
-		+ templateActivity.getActivityTypeId()
-		+ "</number></var>"
-		+ "</struct>"
-		+ "</array>"
-		+ "</var>"
-		+ "<var name='contentFolderID'><string>"
-		+ contentDetails.get("contentFolderID")
-		+ "</string></var>"
-		+ "<var name='createDateTime'><dateTime>2009-6-24T22:45:24+3:0</dateTime></var>"
-		+ "<var name='workspaceFolderID'><number>"
-		+ workspaceFolderID
-		+ "</number></var>"
-		+ "<var name='maxID'><number>1</number></var>"
-		+ "<var name='saveMode'><number>0</number></var>"
-		+ "<var name='validDesign'><boolean value='true' /></var>"
-		+ "<var name='readOnly'><boolean value='false' /></var>"
-		+ "<var name='userID'><string>"
-		+ user.getUserId()
-		+ "</string></var>"
-		+ "<var name='title'><string>"
-		+ learningDesignName
-		+ "</string></var>"
-		+ "<var name='learningDesignID'><number>-111111</number></var>"
-		+ "<var name='copyTypeID'><number>1</number></var>" + "</struct>" + "</data>" + "</wddxPacket>";
+	String design = 
+	    "<wddxPacket version='1.0'>" + "<header />" + "<data>" + "<struct>" + 
+        	"<var name='competences'><array length='0' /></var>" + 
+        	"<var name='branchMappings'><array length='0' /></var>" + 
+        	"<var name='groupings'><array length='0' /></var>" + 
+        	"<var name='transitions'><array length='0' /></var>" + 
+        	"<var name='activities'>" + 
+        		"<array length='1'>" +
+        			"<struct>" +
+        				"<var name='competenceMappings'><array length='0' /></var>" +
+        				"<var name='gradebookToolOutputDefinitionName'><string>string_null_value</string></var>" +
+        				"<var name='extLmsId'><string>string_null_value</string></var>" +
+        				"<var name='toolID'><number>" + tool.getToolId() + "</number></var>" +
+        				"<var name='toolContentID'><number>" + contentDetails.get("toolContentID") + "</number></var>" +
+        				"<var name='toolSignature'><string>" + tool.getToolSignature() + "</string></var>" +
+        				"<var name='toolDisplayName'><string>" + tool.getToolDisplayName() + "</string></var>" +
+        				"<var name='helpURL'><string>" + tool.getHelpUrl() + "</string></var>" +
+        				"<var name='authoringURL'><string>" + tool.getAuthorUrl() + "</string></var>" +
+        				"<var name='stopAfterActivity'><boolean value='false' /></var>" +
+        				"<var name='groupingSupportType'><number>" + templateActivity.getGroupingSupportType() + "</number></var>" +
+        				"<var name='createDateTime'><dateTime>2009-6-12T1:24:50+3:0</dateTime></var>" +
+        				"<var name='defineLater'><boolean value='false' /></var>" +
+        				"<var name='runOffline'><boolean value='false' /></var>" +
+        				"<var name='applyGrouping'><boolean value='false' /></var>" +
+        				"<var name='parentActivityID'><number>-111111</number></var>" +
+        				"<var name='parentUIID'><number>-111111</number></var>" +
+        				"<var name='libraryActivityUIImage'><string>" + templateActivity.getLibraryActivityUiImage() + "</string></var>" +
+        				"<var name='xCoord'><number>124</number></var>" +
+        				"<var name='yCoord'><number>132</number></var>" +
+        				"<var name='helpText'><string>" + templateActivity.getHelpText() + "</string></var>" +
+        				"<var name='description'><string>" + templateActivity.getDescription() + "</string></var>" +
+        				"<var name='activityTitle'><string>" + templateActivity.getTitle() + "</string></var>" +
+        				"<var name='learningLibraryID'><number>" + templateActivity.getLearningLibrary().getLearningLibraryId() + "</number></var>" +
+        				//works with activityUIID=1 but may be we should generate unique one.
+        				"<var name='activityUIID'><number>1</number></var>" +
+        				"<var name='activityCategoryID'><number>" + templateActivity.getActivityCategoryID() + "</number></var>" +
+        				"<var name='activityID'><number>" + templateActivity.getActivityId() + "</number></var>" +
+        				"<var name='activityTypeID'><number>" + templateActivity.getActivityTypeId() + "</number></var>" +
+        			"</struct>" +
+        		"</array>" +
+        	"</var>" +
+        	"<var name='contentFolderID'><string>" + contentDetails.get("contentFolderID") + "</string></var>" +
+        	"<var name='createDateTime'><dateTime>2009-6-24T22:45:24+3:0</dateTime></var>" +
+        	"<var name='workspaceFolderID'><number>" + workspaceFolderID + "</number></var>" +
+        	"<var name='maxID'><number>1</number></var>" +
+        	"<var name='saveMode'><number>0</number></var>" +
+        	"<var name='validDesign'><boolean value='true' /></var>" +
+        	"<var name='readOnly'><boolean value='false' /></var>" +
+        	"<var name='userID'><string>" + user.getUserId() + "</string></var>" +
+        	"<var name='title'><string>" + learningDesignName + "</string></var>" +
+        	"<var name='learningDesignID'><number>-111111</number></var>" +
+        	"<var name='copyTypeID'><number>1</number></var>" +
+            "</struct>" + "</data>" + "</wddxPacket>";
 	return design;
     }
 
Index: lams_tool_assessment/test/java/org/lamsfoundation/lams/tool/assessment/tests/TestAssessment.java
===================================================================
diff -u -r4c4ca4df9cb08c3db920b7a4273a566883ac85b6 -rb7c9e73e8708ec349c247443d5b1890aa356be0c
--- lams_tool_assessment/test/java/org/lamsfoundation/lams/tool/assessment/tests/TestAssessment.java	(.../TestAssessment.java)	(revision 4c4ca4df9cb08c3db920b7a4273a566883ac85b6)
+++ lams_tool_assessment/test/java/org/lamsfoundation/lams/tool/assessment/tests/TestAssessment.java	(.../TestAssessment.java)	(revision b7c9e73e8708ec349c247443d5b1890aa356be0c)
@@ -23,193 +23,190 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.assessment.tests;
 
+import org.lamsfoundation.lams.selenium.AbstractSeleniumTestCase;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
-import org.lamsfoundation.lams.tool.notebook.core.AbstractSeleniumTestCase;
 
 public class TestAssessment extends AbstractSeleniumTestCase {
 
+    protected String getToolSignature() {
+	return AssessmentConstants.TOOL_SIGNATURE;
+    }
 
-	protected String getToolSignature() {
-		return AssessmentConstants.TOOL_SIGNATURE;
-	}
-	
-	protected String getLearningDesignName() {
-		return "assessmentx";
-	}
+    protected String getLearningDesignName() {
+	return "assessmentx";
+    }
 
-	protected void authoringTest() throws InterruptedException {
-		assertEquals("Assessment Tool Authoring", selenium.getTitle());
-		verifyTrue(selenium.isTextPresent("Assessment Tool"));
-		verifyEquals("Basic", selenium.getText("tab-middle-link-1"));
-		
-		assertEquals("Title", selenium.getText("//div[@id='tabbody1']/table/tbody/tr[1]/td/div"));
-		verifyEquals("Assessment", selenium.getValue("assessment.title"));
-		verifyTrue(selenium.isElementPresent("//span[@class='okIcon']"));
-		verifyTrue(selenium.isElementPresent("//span[@class='cancelIcon']"));
-		verifyEquals("Question List", selenium.getText("//div[@id='questionList']/h2"));
-		selenium.type("assessment.title", "Only for clever");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"assessment.instructions\").SetHTML(\"Show your best in mathematics\")");
-		
-		selenium.click("tab-middle-link-2");
-		assertTrue(selenium.isElementPresent("timeLimit"));
-		selenium.click("allowOverallFeedbackAfterQuestion");
-		selenium.click("allowQuestionFeedback");
-		selenium.click("allowRightWrongAnswersAfterQuestion");
-		selenium.click("allowGradesAfterAttempt");
-		selenium.click("allowHistoryResponsesAfterAttempt");
-		
-		selenium.click("tab-middle-link-3");
-		verifyTrue(selenium.isTextPresent("Save"));
-		selenium.type("assessment.onlineInstructions__textarea", "online instructions");
-		
-		selenium.click("tab-middle-link-1");
-		createMultipleChoice();
-		verifyEquals("Easy one", selenium.getText("//table[@id='questionTable']/tbody/tr[2]/td[2]"));
-		
-		createTrueFalse();
-		verifyEquals("Tasty question", selenium.getText("//table[@id='questionTable']/tbody/tr[3]/td[2]"));		 
-	}
-	
-	private void createMultipleChoice() throws InterruptedException {
-		selenium.click("newQuestionInitHref");
-		selenium.selectFrame("TB_iframeContent");
-		waitForElementPresent("title");
-		
-		assertTrue(selenium.isTextPresent("Multiple choice"));
-		selenium.click("link=Add Multiple Choice");
-		verifyTrue(selenium.isTextPresent("You have 3 errors in a form. They have been highlighted."));
-		verifyTrue(selenium.isTextPresent("This field is required."));
-		verifyTrue(selenium.isTextPresent("You should provide at least one possible answer."));
-		verifyTrue(selenium.isTextPresent("One of the answers should have a grade of 100% so it is possible to get full marks for this question."));
-		
-		selenium.type("title", "Easy one");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"question\").SetHTML(\"How much is 2+2?\")");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"generalFeedback\").SetHTML(\"You should better know this\")");
-		verifyEquals("1", selenium.getValue("defaultGrade"));
-		verifyEquals("0.1", selenium.getValue("penaltyFactor"));
-		selenium.click("link=Add Multiple Choice");
-		verifyTrue(selenium.isTextPresent("You have 2 errors in a form. They have been highlighted."));
-//		verifyFalse(selenium.isTextPresent("This field is required."));
+    protected void authoringTest() throws InterruptedException {
+	assertEquals("Assessment Tool Authoring", selenium.getTitle());
+	verifyTrue(selenium.isTextPresent("Assessment Tool"));
+	verifyEquals("Basic", selenium.getText("tab-middle-link-1"));
 
-		selenium.runScript("FCKeditorAPI.GetInstance(\"optionString0\").SetHTML(\"4\")");
-		selenium.select("optionGrade0", "label=100 %");		
-		selenium.type("optionFeedback0__lamstextarea", "good boy");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"optionString1\").SetHTML(\"2\")");
-		selenium.select("optionGrade1", "label=None");		
-		selenium.type("optionFeedback1__lamstextarea", "bad girl");
-		selenium.select("optionGrade2", "label=20 %");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"optionString2\").SetHTML(\"5\")");
-		selenium.type("optionFeedback2__lamstextarea", "Tt could be so, on Mars");
-		selenium.click("link=Add Multiple Choice");
-		
-		//TODO may be get rid of this thing 
-		selenium.selectWindow("openToolId");
-		waitForElementPresent("link=Save");
-	}
-	
-	private void createTrueFalse() throws InterruptedException {
-		selenium.select("questionType", "label=True/False");
-		selenium.click("newQuestionInitHref");
-		selenium.selectFrame("TB_iframeContent");
-		waitForElementPresent("title");
-		
-		assertTrue(selenium.isTextPresent("True/False Question"));
-		selenium.click("link=Add True/False");
-		verifyTrue(selenium.isTextPresent("You have 1 error in a form. It has been highlighted."));
-		
-		selenium.type("title", "Tasty question");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"question\").SetHTML(\"<div>apple + apple = apple pie.  Is this correct?</div>\")");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"generalFeedback\").SetHTML(\"You're ready to become a cook if you know this\")");
-		verifyEquals("1", selenium.getValue("defaultGrade"));
-		verifyEquals("0.1", selenium.getValue("penaltyFactor"));
+	assertEquals("Title", selenium.getText("//div[@id='tabbody1']/table/tbody/tr[1]/td/div"));
+	verifyEquals("Assessment", selenium.getValue("assessment.title"));
+	verifyTrue(selenium.isElementPresent("//span[@class='okIcon']"));
+	verifyTrue(selenium.isElementPresent("//span[@class='cancelIcon']"));
+	verifyEquals("Question List", selenium.getText("//div[@id='questionList']/h2"));
+	selenium.type("assessment.title", "Only for clever");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"assessment.instructions\").SetHTML(\"Show your best in mathematics\")");
 
-		selenium.runScript("FCKeditorAPI.GetInstance(\"feedbackOnCorrect\").SetHTML(\"Unfortunately, this is not true\")");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"feedbackOnIncorrect\").SetHTML(\"Correct!!\")");
-		selenium.click("link=Add True/False");
-		
-		selenium.selectWindow("openToolId");
-		waitForElementPresent("link=Save");
-	}
+	selenium.click("tab-middle-link-2");
+	assertTrue(selenium.isElementPresent("timeLimit"));
+	selenium.click("allowOverallFeedbackAfterQuestion");
+	selenium.click("allowQuestionFeedback");
+	selenium.click("allowRightWrongAnswersAfterQuestion");
+	selenium.click("allowGradesAfterAttempt");
+	selenium.click("allowHistoryResponsesAfterAttempt");
 
-	protected void learningTest() throws InterruptedException {
-		setUpLearning();
-//		assertEquals("Assessment Learning", selenium.getTitle());
-		assertTrue(selenium.isTextPresent("Only for clever"));
-		verifyFalse(selenium.isTextPresent("Started on"));
-		verifyTrue(selenium.isElementPresent("question0"));
-		selenium.click("//input[@name='question0' and @value='1']");
-		selenium.click("question1");
-		
-		selenium.click("submitAll");
-		selenium.waitForPageToLoad("30000");
-		assertEquals("Started on", selenium.getText("//div[@id='content']/table/tbody/tr[1]/th"));
-		verifyTrue(selenium.isTextPresent("0 out of a maximum of 2"));
-		verifyTrue(selenium.isTextPresent("bad girl"));
-		verifyTrue(selenium.isTextPresent("You should better know this"));
-		verifyTrue(selenium.isElementPresent("//form[@id='answers']/table/tbody/tr[2]/td[2]/table/tbody/tr[1]/td[1]/img"));		
-		verifyTrue(selenium.isElementPresent("//form[@id='answers']/table/tbody/tr[2]/td[2]/table/tbody/tr[2]/td[1]/img"));
-		verifyTrue(selenium.isTextPresent("Unfortunately, this is not true"));
-		verifyTrue(selenium.isTextPresent("You're ready to become a cook if you know this"));
-		
-		selenium.click("link=Next Activity");
-		selenium.waitForPageToLoad("30000");
-		assertTrue(selenium.isTextPresent("Congratulations, you have finished."));
-		verifyFalse(selenium.isElementPresent("Only for clever"));
-		tearDownLearning();
+	selenium.click("tab-middle-link-3");
+	verifyTrue(selenium.isTextPresent("Save"));
+	selenium.type("assessment.onlineInstructions__textarea", "online instructions");
 
-		setUpLearning();
-		assertTrue(selenium.isTextPresent("Congratulations, you have finished."));
-		assertFalse(selenium.isTextPresent("Only for clever"));
-		tearDownLearning();
-	 }
+	selenium.click("tab-middle-link-1");
+	createMultipleChoice();
+	verifyEquals("Easy one", selenium.getText("//table[@id='questionTable']/tbody/tr[2]/td[2]"));
 
-	protected void monitoringTest() throws InterruptedException {
-		assertTrue(selenium.isTextPresent("Assessment Tool"));
-		verifyTrue(selenium.isTextPresent("Summary"));
-		verifyEquals("1", selenium.getText("//tr[@id='1']/td[1]"));
-		verifyEquals("Morgan, Mary", selenium.getText("//tr[@id='1']/td[4]"));
-		verifyEquals("0", selenium.getText("//tr[@id='1']/td[5]"));
-		verifyEquals("0", selenium.getText("//tr[@id='1']/td[6]"));		
-		verifyEquals("0.00", selenium.getText("//tr[@id='1']/td[7]"));
-//		verifyFalse(selenium.isElementPresent("//div[4]/table/tbody/tr[2]/td[1]"));
+	createTrueFalse();
+	verifyEquals("Tasty question", selenium.getText("//table[@id='questionTable']/tbody/tr[3]/td[2]"));
+    }
 
-		selenium.click("//tr[@id='1']/td[4]");
-		waitForElementPresent("//div[4]/table/tbody/tr[2]/td[1]");
-//		verifyEquals("1", selenium.getText("//div[4]/table/tbody/tr[2]/td[1]"));
-		verifyEquals("Easy one", selenium.getText("//div[4]/table/tbody/tr[2]/td[3]"));
-		verifyEquals("2", selenium.getText("//tr[@id='1']/td[4]/div"));
-		verifyEquals("0", selenium.getText("//div[4]/table/tbody/tr[2]/td[5]"));
-		verifyEquals("2", selenium.getText("//tr[@id='2']/td[1]"));
-		verifyEquals("Tasty question", selenium.getText("//tr[@id='2']/td[3]"));
-		verifyEquals("true", selenium.getText("//tr[@id='2']/td[4]"));
-		verifyEquals("0", selenium.getText("//tr[@id='2']/td[5]"));
-		
-		selenium.doubleClick("//tr[@id='1']/td[4]");
-		selenium.selectFrame("TB_iframeContent");
-		waitForElementPresent("link=Ok");
-		assertTrue(selenium.isTextPresent("User's history of responses"));
-		verifyEquals("1", selenium.getText("//div[@id='content']/table/tbody/tr[2]/td"));
-		assertTrue(selenium.isTextPresent("How much is 2+2?"));
-		selenium.click("link=Ok");
-		selenium.selectWindow("monitorId");
-		waitForElementPresent("link=Export summary");		
-		
-		selenium.select("questionUid", "label=Easy one");
-		selenium.selectFrame("TB_iframeContent");
-		waitForElementPresent("link=Ok");
-		assertEquals("1", selenium.getText("//div[@id='content']/table/tbody/tr[3]/td"));
-		assertEquals("0.1", selenium.getText("//div[@id='content']/table/tbody/tr[4]/td"));
-		assertEquals("Morgan, Mary", selenium.getText("//tr[@id='1']/td[2]"));
-		assertEquals("2", selenium.getText("//tr[@id='1']/td[3]/div"));
-		assertEquals("0", selenium.getText("//tr[@id='1']/td[4]"));
-		selenium.click("//tr[@id='1']/td[4]");
-		selenium.type("1_grade", "12");
-		selenium.click("link=Ok");
-		selenium.selectWindow("monitorId");
-		waitForElementPresent("link=Export summary");		
-		
-	}
-	
+    private void createMultipleChoice() throws InterruptedException {
+	selenium.click("newQuestionInitHref");
+	selenium.selectFrame("TB_iframeContent");
+	waitForElementPresent("title");
 
+	assertTrue(selenium.isTextPresent("Multiple choice"));
+	selenium.click("link=Add Multiple Choice");
+	verifyTrue(selenium.isTextPresent("You have 3 errors in a form. They have been highlighted."));
+	verifyTrue(selenium.isTextPresent("This field is required."));
+	verifyTrue(selenium.isTextPresent("You should provide at least one possible answer."));
+	verifyTrue(selenium.isTextPresent("One of the answers should have a grade of 100% so it is possible to get full marks for this question."));
 
+	selenium.type("title", "Easy one");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"question\").SetHTML(\"How much is 2+2?\")");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"generalFeedback\").SetHTML(\"You should better know this\")");
+	verifyEquals("1", selenium.getValue("defaultGrade"));
+	verifyEquals("0.1", selenium.getValue("penaltyFactor"));
+	selenium.click("link=Add Multiple Choice");
+	verifyTrue(selenium.isTextPresent("You have 2 errors in a form. They have been highlighted."));
+	// verifyFalse(selenium.isTextPresent("This field is required."));
+
+	selenium.runScript("FCKeditorAPI.GetInstance(\"optionString0\").SetHTML(\"4\")");
+	selenium.select("optionGrade0", "label=100 %");
+	selenium.type("optionFeedback0__lamstextarea", "good boy");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"optionString1\").SetHTML(\"2\")");
+	selenium.select("optionGrade1", "label=None");
+	selenium.type("optionFeedback1__lamstextarea", "bad girl");
+	selenium.select("optionGrade2", "label=20 %");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"optionString2\").SetHTML(\"5\")");
+	selenium.type("optionFeedback2__lamstextarea", "Tt could be so, on Mars");
+	selenium.click("link=Add Multiple Choice");
+
+	// TODO may be get rid of this thing
+	selenium.selectWindow("openToolId");
+	waitForElementPresent("link=Save");
+    }
+
+    private void createTrueFalse() throws InterruptedException {
+	selenium.select("questionType", "label=True/False");
+	selenium.click("newQuestionInitHref");
+	selenium.selectFrame("TB_iframeContent");
+	waitForElementPresent("title");
+
+	assertTrue(selenium.isTextPresent("True/False Question"));
+	selenium.click("link=Add True/False");
+	verifyTrue(selenium.isTextPresent("You have 1 error in a form. It has been highlighted."));
+
+	selenium.type("title", "Tasty question");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"question\").SetHTML(\"<div>apple + apple = apple pie.  Is this correct?</div>\")");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"generalFeedback\").SetHTML(\"You're ready to become a cook if you know this\")");
+	verifyEquals("1", selenium.getValue("defaultGrade"));
+	verifyEquals("0.1", selenium.getValue("penaltyFactor"));
+
+	selenium.runScript("FCKeditorAPI.GetInstance(\"feedbackOnCorrect\").SetHTML(\"Unfortunately, this is not true\")");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"feedbackOnIncorrect\").SetHTML(\"Correct!!\")");
+	selenium.click("link=Add True/False");
+
+	selenium.selectWindow("openToolId");
+	waitForElementPresent("link=Save");
+    }
+
+    protected void learningTest() throws InterruptedException {
+	setUpLearning();
+	// assertEquals("Assessment Learning", selenium.getTitle());
+	assertTrue(selenium.isTextPresent("Only for clever"));
+	verifyFalse(selenium.isTextPresent("Started on"));
+	verifyTrue(selenium.isElementPresent("question0"));
+	selenium.click("//input[@name='question0' and @value='1']");
+	selenium.click("question1");
+
+	selenium.click("submitAll");
+	selenium.waitForPageToLoad("30000");
+	assertEquals("Started on", selenium.getText("//div[@id='content']/table/tbody/tr[1]/th"));
+	verifyTrue(selenium.isTextPresent("0 out of a maximum of 2"));
+	verifyTrue(selenium.isTextPresent("bad girl"));
+	verifyTrue(selenium.isTextPresent("You should better know this"));
+	verifyTrue(selenium.isElementPresent("//form[@id='answers']/table/tbody/tr[2]/td[2]/table/tbody/tr[1]/td[1]/img"));
+	verifyTrue(selenium.isElementPresent("//form[@id='answers']/table/tbody/tr[2]/td[2]/table/tbody/tr[2]/td[1]/img"));
+	verifyTrue(selenium.isTextPresent("Unfortunately, this is not true"));
+	verifyTrue(selenium.isTextPresent("You're ready to become a cook if you know this"));
+
+	selenium.click("link=Next Activity");
+	selenium.waitForPageToLoad("30000");
+	assertTrue(selenium.isTextPresent("Congratulations, you have finished."));
+	verifyFalse(selenium.isElementPresent("Only for clever"));
+	tearDownLearning();
+
+	setUpLearning();
+	assertTrue(selenium.isTextPresent("Congratulations, you have finished."));
+	assertFalse(selenium.isTextPresent("Only for clever"));
+	tearDownLearning();
+    }
+
+    protected void monitoringTest() throws InterruptedException {
+	assertTrue(selenium.isTextPresent("Assessment Tool"));
+	verifyTrue(selenium.isTextPresent("Summary"));
+	verifyEquals("1", selenium.getText("//tr[@id='1']/td[1]"));
+	verifyEquals("Morgan, Mary", selenium.getText("//tr[@id='1']/td[4]"));
+	verifyEquals("0", selenium.getText("//tr[@id='1']/td[5]"));
+	verifyEquals("0", selenium.getText("//tr[@id='1']/td[6]"));
+	verifyEquals("0.00", selenium.getText("//tr[@id='1']/td[7]"));
+	// verifyFalse(selenium.isElementPresent("//div[4]/table/tbody/tr[2]/td[1]"));
+
+	selenium.click("//tr[@id='1']/td[4]");
+	waitForElementPresent("//div[4]/table/tbody/tr[2]/td[1]");
+	// verifyEquals("1", selenium.getText("//div[4]/table/tbody/tr[2]/td[1]"));
+	verifyEquals("Easy one", selenium.getText("//div[4]/table/tbody/tr[2]/td[3]"));
+	verifyEquals("2", selenium.getText("//tr[@id='1']/td[4]/div"));
+	verifyEquals("0", selenium.getText("//div[4]/table/tbody/tr[2]/td[5]"));
+	verifyEquals("2", selenium.getText("//tr[@id='2']/td[1]"));
+	verifyEquals("Tasty question", selenium.getText("//tr[@id='2']/td[3]"));
+	verifyEquals("true", selenium.getText("//tr[@id='2']/td[4]"));
+	verifyEquals("0", selenium.getText("//tr[@id='2']/td[5]"));
+
+	selenium.doubleClick("//tr[@id='1']/td[4]");
+	selenium.selectFrame("TB_iframeContent");
+	waitForElementPresent("link=Ok");
+	assertTrue(selenium.isTextPresent("User's history of responses"));
+	verifyEquals("1", selenium.getText("//div[@id='content']/table/tbody/tr[2]/td"));
+	assertTrue(selenium.isTextPresent("How much is 2+2?"));
+	selenium.click("link=Ok");
+	selenium.selectWindow("monitorId");
+	waitForElementPresent("link=Export summary");
+
+	selenium.select("questionUid", "label=Easy one");
+	selenium.selectFrame("TB_iframeContent");
+	waitForElementPresent("link=Ok");
+	assertEquals("1", selenium.getText("//div[@id='content']/table/tbody/tr[3]/td"));
+	assertEquals("0.1", selenium.getText("//div[@id='content']/table/tbody/tr[4]/td"));
+	assertEquals("Morgan, Mary", selenium.getText("//tr[@id='1']/td[2]"));
+	assertEquals("2", selenium.getText("//tr[@id='1']/td[3]/div"));
+	assertEquals("0", selenium.getText("//tr[@id='1']/td[4]"));
+	selenium.click("//tr[@id='1']/td[4]");
+	selenium.type("1_grade", "12");
+	selenium.click("link=Ok");
+	selenium.selectWindow("monitorId");
+	waitForElementPresent("link=Export summary");
+
+    }
+
 }
Index: lams_tool_notebook/test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
===================================================================
diff -u -r0a314b9b262f6d298df203aeeb58da676732f6c2 -rb7c9e73e8708ec349c247443d5b1890aa356be0c
--- lams_tool_notebook/test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java	(.../TestNotebook.java)	(revision 0a314b9b262f6d298df203aeeb58da676732f6c2)
+++ lams_tool_notebook/test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java	(.../TestNotebook.java)	(revision b7c9e73e8708ec349c247443d5b1890aa356be0c)
@@ -23,50 +23,50 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.notebook.testscripts;
 
-import org.lamsfoundation.lams.tool.notebook.core.AbstractSeleniumTestCase;
+
+import org.lamsfoundation.lams.selenium.AbstractSeleniumTestCase;
 import org.lamsfoundation.lams.tool.notebook.util.NotebookConstants;
 
 public class TestNotebook extends AbstractSeleniumTestCase {
 
+    protected String getToolSignature() {
+	return NotebookConstants.TOOL_SIGNATURE;
+    }
 
-	protected String getToolSignature() {
-		return NotebookConstants.TOOL_SIGNATURE;
-	}
-	
-	protected String getLearningDesignName() {
-		return "bueno";
-	}
+    protected String getLearningDesignName() {
+	return "bueno";
+    }
 
-	protected void authoringTest() {
-		assertEquals("Notebook", selenium.getTitle());
+    protected void authoringTest() {
+	assertEquals("Notebook", selenium.getTitle());
 
-		selenium.type("title", "leave your comment2222");
-		selenium.runScript("FCKeditorAPI.GetInstance(\"instructions\").SetHTML(\"invent a new way of using Flash\")");
-		selenium.click("tab-middle-link-2");
-		selenium.click("lockOnFinished");
-		selenium.click("tab-middle-link-3");
-		selenium.type("onlineInstruction__lamstextarea", "online instructions");
-	}
+	selenium.type("title", "leave your comment2222");
+	selenium.runScript("FCKeditorAPI.GetInstance(\"instructions\").SetHTML(\"invent a new way of using Flash\")");
+	selenium.click("tab-middle-link-2");
+	selenium.click("lockOnFinished");
+	selenium.click("tab-middle-link-3");
+	selenium.type("onlineInstruction__lamstextarea", "online instructions");
+    }
 
-	protected void learningTest() throws InterruptedException {
-		setUpLearning();
-//		assertEquals("Notebook", selenium.getTitle());
-		assertEquals("LAMS Learner", selenium.isElementPresent("//a[@id='finishButton']"));
-		selenium.type("entryText", "have fun");
-		selenium.click("//a[@id='finishButton']/span");
-		selenium.waitForPageToLoad("30000");
-		// assertTrue(selenium.isTextPresent("Congratulations"));
-		assertFalse(selenium.isElementPresent("entryText"));
-		tearDownLearning();
+    protected void learningTest() throws InterruptedException {
+	setUpLearning();
+	// assertEquals("Notebook", selenium.getTitle());
+	assertEquals("LAMS Learner", selenium.isElementPresent("//a[@id='finishButton']"));
+	selenium.type("entryText", "have fun");
+	selenium.click("//a[@id='finishButton']/span");
+	selenium.waitForPageToLoad("30000");
+	// assertTrue(selenium.isTextPresent("Congratulations"));
+	assertFalse(selenium.isElementPresent("entryText"));
+	tearDownLearning();
 
-		setUpLearning();
-		// assertTrue(selenium.isTextPresent("Congratulations"));
-		assertFalse(selenium.isElementPresent("entryText"));
-		tearDownLearning();
-	 }
+	setUpLearning();
+	// assertTrue(selenium.isTextPresent("Congratulations"));
+	assertFalse(selenium.isElementPresent("entryText"));
+	tearDownLearning();
+    }
 
-	protected void monitoringTest() {
-		assertEquals("Notebook", selenium.getTitle());
-	}
+    protected void monitoringTest() {
+	assertEquals("Notebook", selenium.getTitle());
+    }
 
 }