Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
===================================================================
diff -u -r9c471a74c4816ae7dc393c66025d4a004b9e65f1 -rf59da4f03c7449d42d559af803ac5a2093a89803
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision 9c471a74c4816ae7dc393c66025d4a004b9e65f1)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java	(.../TestGateAction.java)	(revision f59da4f03c7449d42d559af803ac5a2093a89803)
@@ -29,6 +29,7 @@
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -84,8 +85,8 @@
     {
         addRequestParameter("method", "knockGate");
         addRequestParameter(LearningWebUtil.PARAM_PROGRESS_ID,TEST_LERNER_PROGRESS_ID);
-        addRequestParameter(LearningWebUtil.PARAM_ACTIVITY_ID,TEST_GATE_ACTIVITY_ID);
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_ACTIVITY_ID,TEST_GATE_ACTIVITY_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         initializeLearnerProgress();
         actionPerform();
@@ -98,8 +99,8 @@
     {
         addRequestParameter("method", "knockGate");
         addRequestParameter(LearningWebUtil.PARAM_PROGRESS_ID,TEST_LERNER_PROGRESS_ID);
-        addRequestParameter(LearningWebUtil.PARAM_ACTIVITY_ID,TEST_GATE_ACTIVITY_ID);
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_ACTIVITY_ID,TEST_GATE_ACTIVITY_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         initializeLearnerProgress();
         actionPerform();
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
===================================================================
diff -u -r9c471a74c4816ae7dc393c66025d4a004b9e65f1 -rf59da4f03c7449d42d559af803ac5a2093a89803
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision 9c471a74c4816ae7dc393c66025d4a004b9e65f1)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java	(.../TestGroupingAction.java)	(revision f59da4f03c7449d42d559af803ac5a2093a89803)
@@ -31,6 +31,7 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.GroupingActivity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -82,8 +83,8 @@
     {
         addRequestParameter("method", "performGrouping");
         addRequestParameter(LearningWebUtil.PARAM_PROGRESS_ID,TEST_LERNER_PROGRESS_ID);
-        addRequestParameter(LearningWebUtil.PARAM_ACTIVITY_ID,TEST_RGRP_ACTIVITY_ID);
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_ACTIVITY_ID,TEST_RGRP_ACTIVITY_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         initializeLearnerProgress();
         actionPerform();
@@ -101,7 +102,7 @@
     public void testViewGrouping()
     {
         addRequestParameter("method", "viewGrouping");
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         LearningWebUtil.putActivityInRequest(request,groupingActivity,learnerService);
         
         actionPerform();
@@ -117,7 +118,7 @@
     public void testCompleteActivity()
     {
         addRequestParameter("method", "completeActivity");
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         request.setAttribute(ActivityAction.ACTIVITY_REQUEST_ATTRIBUTE,groupingActivity);
 
         actionPerform();
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
===================================================================
diff -u -r7d5e18b6ddc40f4de3d34eefa114afc297724289 -rf59da4f03c7449d42d559af803ac5a2093a89803
--- lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision 7d5e18b6ddc40f4de3d34eefa114afc297724289)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java	(.../TestLearnerAction.java)	(revision f59da4f03c7449d42d559af803ac5a2093a89803)
@@ -25,8 +25,8 @@
 package org.lamsfoundation.lams.learning.web.action;
 
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 
 /**
@@ -90,7 +90,7 @@
     public void testJoinLesson()
     {
         addRequestParameter("method", "joinLesson");
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         actionPerform();
         
@@ -110,7 +110,7 @@
     {
         httpSession.setAttribute(ActivityAction.LEARNER_PROGRESS_REQUEST_ATTRIBUTE,testLearnerProgress);
         addRequestParameter("method", "getFlashProgressData");
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         actionPerform();
         verifyNoActionErrors();
@@ -119,7 +119,7 @@
     public void testExitLesson()
     {
         addRequestParameter("method", "exitLesson");
-        addRequestParameter(LearningWebUtil.PARAM_LESSON_ID, TEST_LESSON_ID);
+        addRequestParameter(AttributeNames.PARAM_LESSON_ID, TEST_LESSON_ID);
         
         actionPerform();
         
@@ -131,7 +131,7 @@
     public void testGetLearnerActivityURL()
     {
         addRequestParameter("method", "getLearnerActivityURL");
-        addRequestParameter(LearningWebUtil.PARAM_ACTIVITY_ID, TEST_ACTIVITY_ID);
+        addRequestParameter(AttributeNames.PARAM_ACTIVITY_ID, TEST_ACTIVITY_ID);
         
         actionPerform();