Index: lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml
===================================================================
diff -u -r58a3a69656b21b5047527feab5777a6b9d5b2320 -r61ab8aad9c6a33202b47ca6089e89653b5131b09
--- lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 58a3a69656b21b5047527feab5777a6b9d5b2320)
+++ lams_learning/test/java/WEB-INF/spring/learningApplicationContext.xml	(.../learningApplicationContext.xml)	(revision 61ab8aad9c6a33202b47ca6089e89653b5131b09)
@@ -19,6 +19,7 @@
 		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
 		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
 		<property name="lamsToolService"><ref bean="lamsToolService"/></property>
+		<property name="activityMappings"><ref bean="activityMappings"/></property>
 	</bean>
 	
 	<bean id="learnerService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -38,7 +39,7 @@
 	<bean id="progressEngine" class="org.lamsfoundation.lams.learning.progress.ProgressEngine" singleton="false">
 	</bean>
 	
-	<bean id="actionMappings" class="org.lamsfoundation.lams.learning.web.util.ActionMappingsWithToolWait" singleton="false">
+	<bean id="activityMappings" class="org.lamsfoundation.lams.learning.web.util.ActivityMapping" singleton="false">
 		<property name="toolService"><ref bean="toolService"/></property>
 	</bean>