Index: trunk/terracotta/bootstrap/pom.xml
===================================================================
diff -u -N -r2388 -r2435
--- trunk/terracotta/bootstrap/pom.xml	(.../pom.xml)	(revision 2388)
+++ trunk/terracotta/bootstrap/pom.xml	(.../pom.xml)	(revision 2435)
@@ -21,13 +21,13 @@
     <dependency>
       <groupId>org.terracotta.toolkit</groupId>
       <artifactId>terracotta-toolkit-api</artifactId>
-      <version>2.1.0</version>
+      <version>2.5</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.terracotta.toolkit</groupId>
       <artifactId>terracotta-toolkit-api-internal</artifactId>
-      <version>2.1.0</version>
+      <version>1.12</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
Index: trunk/system-tests/src/test/java/org/terracotta/quartz/tests/AbstractStandaloneTest.java
===================================================================
diff -u -N -r2367 -r2435
--- trunk/system-tests/src/test/java/org/terracotta/quartz/tests/AbstractStandaloneTest.java	(.../AbstractStandaloneTest.java)	(revision 2367)
+++ trunk/system-tests/src/test/java/org/terracotta/quartz/tests/AbstractStandaloneTest.java	(.../AbstractStandaloneTest.java)	(revision 2435)
@@ -53,8 +53,9 @@
     String binder = TestBaseUtil.jarFor(org.slf4j.impl.StaticLoggerBinder.class);
     String log4j = TestBaseUtil.jarFor(org.apache.log4j.Level.class);
     String junit = TestBaseUtil.jarFor(org.junit.Assert.class);
+    String mockito = TestBaseUtil.jarFor(org.hamcrest.core.Is.class);
 
-    return makeClasspath(toolkitRuntime, test, quartz, quartzJobs, logging, binder, log4j, junit);
+    return makeClasspath(toolkitRuntime, test, quartz, quartzJobs, logging, binder, log4j, junit, mockito);
   }
   
   /** An empty job for testing purpose. */
Index: trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/collections/SerializedToolkitStore.java
===================================================================
diff -u -N -r2258 -r2435
--- trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/collections/SerializedToolkitStore.java	(.../SerializedToolkitStore.java)	(revision 2258)
+++ trunk/terracotta/bootstrap/src/main/java/org/terracotta/quartz/collections/SerializedToolkitStore.java	(.../SerializedToolkitStore.java)	(revision 2435)
@@ -192,6 +192,26 @@
     return this.toolkitStore.replace(serializeToString(key), value);
   }
 
+  @Override
+  public boolean isBulkLoadEnabled() {
+    return this.toolkitStore.isBulkLoadEnabled();
+  }
+
+  @Override
+  public boolean isNodeBulkLoadEnabled() {
+    return this.toolkitStore.isNodeBulkLoadEnabled();
+  }
+
+  @Override
+  public void setNodeBulkLoadEnabled(boolean enabledBulkLoad) {
+    this.toolkitStore.setNodeBulkLoadEnabled(enabledBulkLoad);
+  }
+
+  @Override
+  public void waitUntilBulkLoadComplete() throws InterruptedException {
+    this.toolkitStore.waitUntilBulkLoadComplete();
+  }
+
   private static class ToolkitEntrySet<K, V> implements Set<java.util.Map.Entry<K, V>> {
     private final Set<java.util.Map.Entry<String, V>> set;
 
Index: trunk/system-tests/pom.xml
===================================================================
diff -u -N -r2427 -r2435
--- trunk/system-tests/pom.xml	(.../pom.xml)	(revision 2427)
+++ trunk/system-tests/pom.xml	(.../pom.xml)	(revision 2435)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.terracotta</groupId>
     <artifactId>system-tests-parent</artifactId>
-    <version>4.0.6-SNAPSHOT</version>
+    <version>4.2.0-SNAPSHOT</version>
     <relativePath/>
   </parent>