diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
index 86e3ade569ff21d3af839f325efa4d57f48bf05b..fb4a9bd7133c6037bc63f264b50e425150836398 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/AbstractLoaderTestCase.java
@@ -43,9 +43,6 @@ public abstract class AbstractLoaderTestCase extends AbstractDAOWithoutContextTe
 
     private static final String SESSION_TOKEN = "session-token";
 
-    protected static final Session SESSION = new Session(CommonTestUtils.USER_ID, SESSION_TOKEN,
-            PRINCIPAL, "remote-host", 1);
-    
     protected ICommonBusinessObjectFactory boFactory;
 
     @Autowired
@@ -53,4 +50,10 @@ public abstract class AbstractLoaderTestCase extends AbstractDAOWithoutContextTe
     {
         this.boFactory = boFactory;
     }
+    
+    protected Session session()
+    {
+        return new Session(CommonTestUtils.USER_ID, SESSION_TOKEN,
+                PRINCIPAL, "remote-host", 1);
+    }
 }
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
index f8267d579ef1125ed4658552fb378e28215605a2..1c417ec20eb16f853088ef22532aebd8debfffd9 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/business/SampleLoaderTest.java
@@ -25,7 +25,8 @@ import java.util.List;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
-import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.SampleLoader;
+import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
 
 /**
  * 
@@ -39,7 +40,9 @@ public class SampleLoaderTest extends AbstractLoaderTestCase
     @Test
     public void test()
     {
-        SampleLoader loader = new SampleLoader(SESSION, daoFactory, boFactory);
+        Session session = session();
+        session.setPerson(new PersonPE());
+        SampleLoader loader = new SampleLoader(session, daoFactory, boFactory);
         List<Sample> samples = loader.listSamplesWithParentsByTypeAndSpace("CELL_PLATE", "CISD");
         Collections.sort(samples, new Comparator<Sample>()
             {