diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index 0599ab1445313c7638504ffc708d2be8d2d3f714..0e56a300ea6056149639caf01e4925978e0b7bc7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -45,7 +45,6 @@ import ch.systemsx.cisd.common.filesystem.QueueingPathRemoverService;
 import ch.systemsx.cisd.common.mail.IMailClient;
 import ch.systemsx.cisd.common.utilities.ExtendedProperties;
 import ch.systemsx.cisd.common.utilities.IDelegatedActionWithResult;
-import ch.systemsx.cisd.etlserver.DataSetRegistrationAlgorithm;
 import ch.systemsx.cisd.etlserver.DynamicTransactionQueryFactory;
 import ch.systemsx.cisd.etlserver.IStorageProcessorTransactional;
 import ch.systemsx.cisd.etlserver.ITopLevelDataSetRegistratorDelegate;
@@ -108,10 +107,6 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
 
     protected File subDataSet2;
 
-    protected boolean didDataSetRollbackHappen;
-
-    protected boolean didServiceRollbackHappen;
-
     @BeforeTest
     public void init()
     {
@@ -378,7 +373,8 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
         }
     }
 
-    protected class TestingDataSetHandler extends JythonTopLevelDataSetHandler<DataSetInformation>
+    public static class TestingDataSetHandler extends
+            JythonTopLevelDataSetHandler<DataSetInformation>
     {
         protected final boolean shouldRegistrationFail;
 
@@ -400,6 +396,8 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
 
         protected boolean didPostStorageFunctionRunHappen = false;
 
+        protected boolean didServiceRollbackHappen = false;
+        
         protected String registrationContextError;
 
         public TestingDataSetHandler(TopLevelDataSetRegistratorGlobalState globalState,
@@ -465,7 +463,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
                     ((JythonDataSetRegistrationService<DataSetInformation>) service)
                             .getInterpreter();
             didRollbackServiceFunctionRun =
-                    interpreter.get("didRollbackServiceFunctionRun", Boolean.class);
+                    readBoolean(interpreter, "didRollbackServiceFunctionRun");
         }
 
         @Override
@@ -544,8 +542,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
                     ((JythonDataSetRegistrationService<DataSetInformation>) service)
                             .getInterpreter();
             didSecondaryTransactionErrorNotificationHappen =
-                    interpreter
-                            .get("didSecondaryTransactionErrorNotificationHappen", Boolean.class);
+                    readBoolean(interpreter, "didSecondaryTransactionErrorNotificationHappen");
         }
 
         @Override
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
index dbc41b474eeef2bb1ce770e080bdf0031f578aca..867b511cc395c293782700cbe4425a07ee76e80b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorRollbackTest.java
@@ -59,9 +59,6 @@ public class JythonTopLevelDataSetRegistratorRollbackTest extends AbstractJython
     public void setUp() throws IOException
     {
         super.setUp();
-
-        didDataSetRollbackHappen = false;
-        didServiceRollbackHappen = false;
     }
 
     @Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 8c56811843e1216553b6ea5002faf937213249c3..0ddb70d0e5b75459761d483e49106bd8c37b109b 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -99,9 +99,6 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         super.setUp();
 
         logAppender = new BufferedAppender();
-
-        didDataSetRollbackHappen = false;
-        didServiceRollbackHappen = false;
     }
 
     @DataProvider(name = "simpleTransactionTestCaseProvider")
@@ -1097,8 +1094,9 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
 
         handler.handle(markerFile);
 
-        assertFalse(didDataSetRollbackHappen);
-        assertTrue(didServiceRollbackHappen);
+        TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
+        
+        assertTrue(theHandler.didServiceRollbackHappen);
         context.assertIsSatisfied();
     }
 
@@ -1138,7 +1136,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
 
         TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
-        assertFalse(didServiceRollbackHappen);
+        assertFalse(theHandler.didServiceRollbackHappen);
         assertFalse(theHandler.didTransactionRollbackHappen);
         assertFalse(theHandler.didRollbackServiceFunctionRun);
 
@@ -1163,7 +1161,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
 
         TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
-        assertFalse(didServiceRollbackHappen);
+        assertFalse(theHandler.didServiceRollbackHappen);
         assertFalse(theHandler.didTransactionRollbackHappen);
         context.assertIsSatisfied();
     }
@@ -1186,7 +1184,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
         assertEquals(0, MockStorageProcessor.instance.calledCommitCount);
 
         TestingDataSetHandler theHandler = (TestingDataSetHandler) handler;
-        assertFalse(didServiceRollbackHappen);
+        assertFalse(theHandler.didServiceRollbackHappen);
         assertFalse(theHandler.didTransactionRollbackHappen);
         assertTrue(theHandler.didSecondaryTransactionErrorNotificationHappen);
         context.assertIsSatisfied();