Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java
===================================================================
diff -u -r36c2ed010b8a3893b895d781be1a219f2380e62d -rb518266b001deca868eb67fedbbb9fc079f9bd58
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision 36c2ed010b8a3893b895d781be1a219f2380e62d)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/DummyLearnerService.java	(.../DummyLearnerService.java)	(revision b518266b001deca868eb67fedbbb9fc079f9bd58)
@@ -31,7 +31,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.lamsfoundation.lams.learning.web.bean.ActivityURL;
-import org.lamsfoundation.lams.learning.web.util.ActionMappings;
+import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ActivityOrderComparator;
 import org.lamsfoundation.lams.learningdesign.ComplexActivity;
@@ -56,7 +56,7 @@
 	private HttpServletRequest request;
 	private static String NAME = "lams.learning.testlearnerservice";
 	
-	private ActionMappings actionMappings;
+	private ActivityMapping activityMapping;
 	
 	private ILessonDAO lessonDAO;
 	
@@ -72,8 +72,8 @@
 		this.request = request;
 	}
 	
-	public void setActionMappings(ActionMappings actionMappings) {
-		this.actionMappings = actionMappings;
+	public void setActivityMapping(ActivityMapping actionMappings) {
+		this.activityMapping = actionMappings;
 	}
 
 	private LearnerProgress getProgress() {
@@ -126,6 +126,9 @@
 		long completedActivityId = completedActivity.getActivityId().longValue();
 		setComplete(completedActivityId, progress);
 		
+		progress.setParallelWaiting(false);
+		progress.setLessonComplete(false);
+		
 		Activity nextActivity = null;
 		Activity previousActivity = null;
 		Activity currentActivity = progress.getCurrentActivity();
@@ -148,8 +151,10 @@
 			    currentActivity = nextActivity;
 		    }
 		    else {
-		        nextActivity = new ParallelWaitActivity();
+		        //nextActivity = new ParallelWaitActivity();
+		    	nextActivity = null;
 			    previousActivity = completedActivity;
+			    progress.setParallelWaiting(true);
 		    }
 		}
 		else if (completedActivityId == 6) {
@@ -170,9 +175,11 @@
 		    }
 		}
 		else if (completedActivityId == 10) {
-		    nextActivity = new LessonCompleteActivity();
+		    //nextActivity = new LessonCompleteActivity();
+			nextActivity = null;
 		    previousActivity = currentActivity;
 		    currentActivity = nextActivity;
+		    progress.setLessonComplete(true);
 		}
 
 		progress.setCurrentActivity(currentActivity);
@@ -193,7 +200,7 @@
     	Activity activity = getActivity(toolSessionId, progress);
     	
     	progress = calculateProgress(activity, learner, lesson);
-    	String url = actionMappings.getProgressURL(progress);
+    	String url = activityMapping.getProgressURL(progress);
     	
     	return url;
 	}