Index: lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
===================================================================
diff -u -r6f11dd80335ff2b8a2d06d21f1a49b307ed233c1 -reabb1eb30e30ef2d6a8faa2d3471c34e6a619cfc
--- lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision 6f11dd80335ff2b8a2d06d21f1a49b307ed233c1)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java	(.../TestExportPortfolioService.java)	(revision eabb1eb30e30ef2d6a8faa2d3471c34e6a619cfc)
@@ -118,11 +118,12 @@
         toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO");
         transitionDao = (TransitionDAO)this.context.getBean("transitionDAO");
         exportService = (IExportPortfolioService) this.context.getBean("exportService");
-        testUser = usermanageService.getUserById(TEST_USER_ID);
+ /*      Commented out as usermanageService.getUserById has been removed 
+  * 	 testUser = usermanageService.getUserById(TEST_USER_ID);
         testLesson = lessonDao.getLesson(TEST_LESSON_ID);
         
         testLesson_fromCommon = lessonDao.getLesson(TEST_LESSON_ID_fromCommon);
-        testUser_fromCommon = usermanageService.getUserById(TEST_USER_ID_fromCommon);
+        testUser_fromCommon = usermanageService.getUserById(TEST_USER_ID_fromCommon); */
    }
 
     /*
Index: lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
===================================================================
diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -reabb1eb30e30ef2d6a8faa2d3471c34e6a619cfc
--- lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae)
+++ lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java	(.../TestLearnerService.java)	(revision eabb1eb30e30ef2d6a8faa2d3471c34e6a619cfc)
@@ -72,7 +72,8 @@
     //---------------------------------------------------------------------
     // Testing Data - Constants
     //---------------------------------------------------------------------
-    private final Integer TEST_USER_ID = new Integer(2);
+    private final Integer TEST_USER_ID = new Integer(4);
+    private final String TEST_USER_LOGIN = "mmm";
     private final Long Test_Lesson_ID = new Long(2);
     private final long TEST_TOOL_SESSION_ID = 1;
     //---------------------------------------------------------------------
@@ -121,7 +122,7 @@
         toolSessionDao = (ToolSessionDAO)this.context.getBean("toolSessionDAO");
         activityDao = (IActivityDAO)this.context.getBean("activityDAO");
         
-        testUser = usermanageService.getUserById(TEST_USER_ID);
+        testUser = usermanageService.getUserByLogin(TEST_USER_LOGIN);
         testLesson = lessonDao.getLesson(Test_Lesson_ID);
     }
 
@@ -344,7 +345,7 @@
     
     public void testKnockSynchGateOpen()
     {
-        User testUser2= usermanageService.getUserById(new Integer(1));
+        User testUser2= usermanageService.getUserByLogin(TEST_USER_LOGIN);
         
         //get sync gate
         GateActivity synchGate = (GateActivity)learnerService.getActivity(new Long(TEST_SYNCHGATE_ACTIVITY_ID));