diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF
index 80ee857966..18da37cd6b 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/META-INF/MANIFEST.MF
@@ -5,17 +5,19 @@ Bundle-Vendor: %Bundle-Vendor
 Bundle-Version: 1.0.9.qualifier
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.tracecompass.datastore.core.tests;singleton:=true
-Fragment-Host: org.eclipse.tracecompass.datastore.core
+Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit;bundle-version="4.0.0",
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.tracecompass.datastore.core.encoding,
- org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.historytree;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.serialization;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core.tests"
+ org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional,
+ org.eclipse.tracecompass.datastore.core
+Export-Package: org.eclipse.tracecompass.datastore.core.tests.condition,
+ org.eclipse.tracecompass.datastore.core.tests.encoding,
+ org.eclipse.tracecompass.datastore.core.tests.historytree,
+ org.eclipse.tracecompass.datastore.core.tests.historytree.classic,
+ org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping,
+ org.eclipse.tracecompass.datastore.core.tests.serialization,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic,
+ org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping
 Import-Package: com.google.common.collect
 Automatic-Module-Name: org.eclipse.tracecompass.datastore.core.tests
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/ContinuousTimeRangeConditionTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/ContinuousTimeRangeConditionTest.java
similarity index 95%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/ContinuousTimeRangeConditionTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/ContinuousTimeRangeConditionTest.java
index afc6a2c5e3..6756cb1c67 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/ContinuousTimeRangeConditionTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/ContinuousTimeRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.ContinuousTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteIntegerRangeConditionTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteIntegerRangeConditionTest.java
similarity index 96%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteIntegerRangeConditionTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteIntegerRangeConditionTest.java
index 0145717cc3..690a7d6c3d 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteIntegerRangeConditionTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteIntegerRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -22,6 +22,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.ArrayIntegerRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.IntegerRangeCondition;
 import org.junit.Test;
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteTimeRangeConditionTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteTimeRangeConditionTest.java
similarity index 96%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteTimeRangeConditionTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteTimeRangeConditionTest.java
index 92ac2f8083..12269dd0d4 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/DiscreteTimeRangeConditionTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/DiscreteTimeRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,6 +23,7 @@
 import java.util.List;
 
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.tracecompass.internal.datastore.core.condition.ArrayTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/SingletonTimeRangeConditionTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/SingletonTimeRangeConditionTest.java
similarity index 94%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/SingletonTimeRangeConditionTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/SingletonTimeRangeConditionTest.java
index 6b92bbd54b..5e3e6e3a14 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/condition/SingletonTimeRangeConditionTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/condition/SingletonTimeRangeConditionTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  ******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.condition;
+package org.eclipse.tracecompass.datastore.core.tests.condition;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.eclipse.tracecompass.internal.datastore.core.condition.SingletonTimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.junit.Test;
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/encoding/HTVarIntTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/encoding/HTVarIntTest.java
similarity index 94%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/encoding/HTVarIntTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/encoding/HTVarIntTest.java
index 8db14c9140..8abb84261e 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/encoding/HTVarIntTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/encoding/HTVarIntTest.java
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.tracecompass.datastore.core.encoding;
+package org.eclipse.tracecompass.datastore.core.tests.encoding;
 
 import static org.junit.Assert.assertEquals;
 
@@ -16,6 +16,7 @@
 import java.util.PrimitiveIterator.OfLong;
 import java.util.Random;
 
+import org.eclipse.tracecompass.datastore.core.encoding.HTVarInt;
 import org.junit.Test;
 
 /**
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTreeTestBase.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/AbstractHistoryTreeTestBase.java
similarity index 98%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTreeTestBase.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/AbstractHistoryTreeTestBase.java
index 2a1a4ad54b..5b5a8fe824 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTreeTestBase.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/AbstractHistoryTreeTestBase.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,6 +26,8 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTCoreNodeTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTCoreNodeTest.java
similarity index 95%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTCoreNodeTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTCoreNodeTest.java
index 03f1cdbe96..7b8fcf7e14 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTCoreNodeTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTCoreNodeTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -20,10 +20,12 @@
 
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNodeTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTNodeTest.java
similarity index 97%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNodeTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTNodeTest.java
index 6af986eb90..27a6806e50 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNodeTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HTNodeTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,11 +23,14 @@
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.datastore.core.historytree.HtIo;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.junit.After;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStubTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HistoryTreeStubTest.java
similarity index 85%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStubTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HistoryTreeStubTest.java
index e1c5c2c9f7..0a7919e717 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStubTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HistoryTreeStubTest.java
@@ -9,12 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 
 /**
  * Test the default abstract implementation of the tree, with a concrete stub.
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIoTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtIoTest.java
similarity index 96%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIoTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtIoTest.java
index 3647328933..f907d958d2 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIoTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtIoTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -23,9 +23,9 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.HistoryTreeStub;
+import org.eclipse.tracecompass.internal.datastore.core.historytree.HtIo;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HistoryTreeStub;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
 import org.junit.After;
 import org.junit.Before;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HtTestUtils.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtTestUtils.java
similarity index 96%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HtTestUtils.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtTestUtils.java
index 56d9be713d..686e3a551f 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HtTestUtils.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/HtTestUtils.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -21,6 +21,8 @@
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.IHTNode.NodeType;
 
 /**
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/ClassicHistoryTreeTest.java
similarity index 87%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/ClassicHistoryTreeTest.java
index 2871204bb0..fbf846f67f 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/ClassicHistoryTreeTest.java
@@ -9,14 +9,16 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.classic;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic.ClassicHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicNode;
 
 /**
  * Test the classic history tree
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/package-info.java
similarity index 87%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/package-info.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/package-info.java
index d0c1617c48..2b8814013d 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/package-info.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/classic/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.classic;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java
similarity index 93%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java
index 552653d283..2317f7e079 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/AbstractOverlappingHistoryTreeTestBase.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
 
 import static org.junit.Assert.assertEquals;
 
@@ -17,8 +17,10 @@
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.IHTInterval;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HtTestUtils;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.AbstractOverlappingHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingNode;
 import org.junit.Test;
 
 /**
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/OverlappingHistoryTreeTest.java
similarity index 90%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/OverlappingHistoryTreeTest.java
index ffa51cb05d..bb4fc3f914 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/OverlappingHistoryTreeTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -17,11 +17,13 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.AbstractHistoryTreeTestBase;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HtTestUtils;
+import org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping.OverlappingHistoryTreeStub;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTreeTestBase;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HtTestUtils;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingNode;
 import org.junit.Test;
 
 /**
@@ -49,8 +51,7 @@ protected OverlappingHistoryTreeStub createHistoryTree(File stateHistoryFile,
     }
 
     @Override
-    protected OverlappingHistoryTreeStub createHistoryTree(@NonNull File existingStateFile,
-            int expectedProviderVersion) throws IOException {
+    protected OverlappingHistoryTreeStub createHistoryTree(File existingStateFile, int expectedProviderVersion) throws IOException {
         return new OverlappingHistoryTreeStub(existingStateFile, expectedProviderVersion);
     }
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/package-info.java
similarity index 85%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/package-info.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/package-info.java
index 3adf12d5d3..29504dd236 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/package-info.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/overlapping/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/package-info.java
similarity index 85%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/package-info.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/package-info.java
index e5441e44e8..22be2e4c8e 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/package-info.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/historytree/package-info.java
@@ -10,4 +10,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.historytree;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/serialization/SafeByteBufferWrapperTest.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/serialization/SafeByteBufferWrapperTest.java
similarity index 98%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/serialization/SafeByteBufferWrapperTest.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/serialization/SafeByteBufferWrapperTest.java
index bf856ac7aa..c6e864d159 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/internal/datastore/core/serialization/SafeByteBufferWrapperTest.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/src/org/eclipse/tracecompass/datastore/core/tests/serialization/SafeByteBufferWrapperTest.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.datastore.core.serialization;
+package org.eclipse.tracecompass.datastore.core.tests.serialization;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -21,6 +21,7 @@
 import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferReader;
 import org.eclipse.tracecompass.datastore.core.serialization.ISafeByteBufferWriter;
 import org.eclipse.tracecompass.datastore.core.serialization.SafeByteBufferFactory;
+import org.eclipse.tracecompass.internal.datastore.core.serialization.SafeByteBufferWrapper;
 import org.junit.Test;
 
 /**
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStub.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/HistoryTreeStub.java
similarity index 92%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStub.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/HistoryTreeStub.java
index 6e5c171183..eb64c4b784 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HistoryTreeStub.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/HistoryTreeStub.java
@@ -9,13 +9,15 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 
 /**
  * A stub history tree for the base abstract history tree
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeStub.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/ClassicHistoryTreeStub.java
similarity index 92%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeStub.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/ClassicHistoryTreeStub.java
index 88293ada35..d17d997e6d 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTreeStub.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/ClassicHistoryTreeStub.java
@@ -9,12 +9,14 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic.ClassicNode;
 
 /**
  * A stub for the classic history tree. Limits type "E" to {@link HTInterval}.
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/package-info.java
new file mode 100644
index 0000000000..7f47023813
--- /dev/null
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/classic/package-info.java
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2017 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.classic;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeStub.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/OverlappingHistoryTreeStub.java
similarity index 89%
rename from statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeStub.java
rename to statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/OverlappingHistoryTreeStub.java
index 8d67a2d71b..cbc4929af7 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingHistoryTreeStub.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/OverlappingHistoryTreeStub.java
@@ -9,12 +9,14 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping;
 
 import java.io.File;
 import java.io.IOException;
 
 import org.eclipse.tracecompass.datastore.core.interval.HTInterval;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingHistoryTree;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.OverlappingNode;
 
 /**
  * A stub for the overlapping history tree, specifying the object type to
@@ -108,17 +110,17 @@ public int getLastInsertionLocation() {
     // ------------------------------------------------------------------------
 
     @Override
-    protected OverlappingNode<HTInterval> getLatestNode(int depth) {
+    public OverlappingNode<HTInterval> getLatestNode(int depth) {
         return super.getLatestNode(depth);
     }
 
     @Override
-    protected int getDepth() {
+    public int getDepth() {
         return super.getDepth();
     }
 
     @Override
-    protected OverlappingNode<HTInterval> getLatestLeaf() {
+    public OverlappingNode<HTInterval> getLatestLeaf() {
         return super.getLatestLeaf();
     }
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/package-info.java
new file mode 100644
index 0000000000..6c720a884c
--- /dev/null
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/overlapping/package-info.java
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2017 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree.overlapping;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/package-info.java b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/package-info.java
new file mode 100644
index 0000000000..77731c60d5
--- /dev/null
+++ b/statesystem/org.eclipse.tracecompass.datastore.core.tests/stubs/org/eclipse/tracecompass/datastore/core/tests/stubs/historytree/package-info.java
@@ -0,0 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2017 École Polytechnique de Montréal
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0 which
+ * accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.tracecompass.datastore.core.tests.stubs.historytree;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.datastore.core/META-INF/MANIFEST.MF
index 22963b6692..5aa51273cc 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/META-INF/MANIFEST.MF
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/META-INF/MANIFEST.MF
@@ -16,14 +16,18 @@ Export-Package: org.eclipse.tracecompass.datastore.core.encoding,
  org.eclipse.tracecompass.datastore.core.interval,
  org.eclipse.tracecompass.datastore.core.serialization,
  org.eclipse.tracecompass.internal.datastore.core;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.condition;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.historytree;x-internal:=true,
- org.eclipse.tracecompass.internal.datastore.core.serialization;x-internal:=true,
- org.eclipse.tracecompass.internal.provisional.datastore.core.condition;x-friends:="org.eclipse.tracecompass.statesystem.core,org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests",
+ org.eclipse.tracecompass.internal.datastore.core.condition;x-friends:="org.eclipse.tracecompass.datastore.core.tests",
+ org.eclipse.tracecompass.internal.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.datastore.core.tests",
+ org.eclipse.tracecompass.internal.datastore.core.serialization;x-friends:="org.eclipse.tracecompass.datastore.core.tests",
+ org.eclipse.tracecompass.internal.provisional.datastore.core.condition;
+  x-friends:="org.eclipse.tracecompass.statesystem.core,
+   org.eclipse.tracecompass.segmentstore.core,
+   org.eclipse.tracecompass.segmentstore.core.tests,
+   org.eclipse.tracecompass.datastore.core.tests",
  org.eclipse.tracecompass.internal.provisional.datastore.core.exceptions,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-friends:="org.eclipse.tracecompass.statesystem.core,org.eclipse.tracecompass.statesystem.core.tests",
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests"
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests,org.eclipse.tracecompass.datastore.core.tests",
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.classic;x-friends:="org.eclipse.tracecompass.statesystem.core,org.eclipse.tracecompass.statesystem.core.tests,org.eclipse.tracecompass.datastore.core.tests",
+ org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping;x-friends:="org.eclipse.tracecompass.segmentstore.core,org.eclipse.tracecompass.segmentstore.core.tests,org.eclipse.tracecompass.datastore.core.tests"
 Import-Package: com.google.common.annotations,
  com.google.common.base,
  com.google.common.cache,
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIo.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIo.java
index 08fec8b924..fdc6ce6b17 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIo.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/datastore/core/historytree/HtIo.java
@@ -123,7 +123,7 @@ public HTNode<IHTInterval> load(CacheKey key) throws IOException {
      * read again
      */
     @VisibleForTesting
-    static void clearCache() {
+    public static void clearCache() {
         NODE_CACHE.invalidateAll();
     }
 
@@ -138,7 +138,7 @@ static void clearCache() {
      *         <code>false</code> otherwise
      */
     @VisibleForTesting
-    static <E extends IHTInterval, N extends HTNode<E>> boolean isInCache(HtIo<E, N> htio, int seqNum) {
+    public static <E extends IHTInterval, N extends HTNode<E>> boolean isInCache(HtIo<E, N> htio, int seqNum) {
         @SuppressWarnings("unchecked")
         @Nullable HTNode<IHTInterval> present = NODE_CACHE.getIfPresent(new CacheKey((HtIo<IHTInterval, HTNode<IHTInterval>>) htio, seqNum));
         return (present != null);
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTree.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTree.java
index 875921990e..7f33f92dce 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTree.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/AbstractHistoryTree.java
@@ -369,7 +369,7 @@ public long getFileSize() {
      * @return The immutable latest branch
      */
     @VisibleForTesting
-    protected final List<N> getLatestBranch() {
+    public final List<N> getLatestBranch() {
         List<N> latestBranchSnapshot = fLatestBranchSnapshot;
         if (latestBranchSnapshot == null) {
             synchronized (fLatestBranch) {
@@ -388,7 +388,8 @@ protected final List<N> getLatestBranch() {
      *            The depth at which to get the node
      * @return The node at depth
      */
-    protected N getLatestNode(int depth) {
+    @VisibleForTesting
+    public N getLatestNode(int depth) {
         if (depth > fLatestBranch.size()) {
             throw new IndexOutOfBoundsException("Trying to get latest node too deep"); //$NON-NLS-1$
         }
@@ -435,7 +436,7 @@ protected N getLatestNode(int depth) {
      *             closed
      */
     @VisibleForTesting
-    protected @NonNull N getNode(int seqNum) throws ClosedChannelException {
+    public @NonNull N getNode(int seqNum) throws ClosedChannelException {
         // First, check in the latest branch if the node is there
         for (N node : fLatestBranch) {
             if (node.getSequenceNumber() == seqNum) {
@@ -978,7 +979,7 @@ public String toString() {
      * @return The current depth
      */
     @VisibleForTesting
-    protected int getDepth() {
+    public int getDepth() {
         return getLatestBranch().size();
     }
 
@@ -988,7 +989,7 @@ protected int getDepth() {
      * @return The latest leaf
      */
     @VisibleForTesting
-    protected N getLatestLeaf() {
+    public N getLatestLeaf() {
         List<N> latestBranch = getLatestBranch();
         return latestBranch.get(latestBranch.size() - 1);
     }
@@ -1005,7 +1006,7 @@ protected N getLatestLeaf() {
      * @return False if a problem was found, true otherwise
      */
     @VisibleForTesting
-    protected boolean verifyChildrenSpecific(N parent,
+    public boolean verifyChildrenSpecific(N parent,
             int index,
             N child) {
         // Nothing to do for the default implementation
@@ -1023,7 +1024,7 @@ protected boolean verifyChildrenSpecific(N parent,
      * @return False if a problem was found, true otherwise
      */
     @VisibleForTesting
-    protected boolean verifyIntersectingChildren(N parent, N child) {
+    public boolean verifyIntersectingChildren(N parent, N child) {
         int childSequence = child.getSequenceNumber();
         boolean shouldBeInCollection;
         Collection<Integer> nextChildren;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNode.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNode.java
index 50e174a66c..fc09e2d337 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNode.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/HTNode.java
@@ -663,7 +663,7 @@ public boolean isOnDisk() {
      *
      * @return The list of intervals in this node
      */
-    protected List<E> getIntervals() {
+    public List<E> getIntervals() {
         return ImmutableList.copyOf(fIntervals);
     }
 
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTree.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTree.java
index b998bedc8f..4d609dc3b5 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTree.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/classic/ClassicHistoryTree.java
@@ -119,7 +119,7 @@ protected IHTNodeFactory<E, ClassicNode<E>> getNodeFactory() {
     }
 
     @Override
-    protected long getNewBranchStart(int depth, E interval) {
+    public long getNewBranchStart(int depth, E interval) {
         // The new branch starts at the end of the tree + 1, because the last
         // branch closed at tree end and they must be sequential
         return getTreeEnd() + 1;
@@ -131,14 +131,14 @@ protected long getNewBranchStart(int depth, E interval) {
 
     @Override
     @VisibleForTesting
-    protected boolean verifyChildrenSpecific(ClassicNode<E> parent,
+    public boolean verifyChildrenSpecific(ClassicNode<E> parent,
             int index, ClassicNode<E> child) {
         return (parent.getChildStart(index) == child.getNodeStart());
     }
 
     @Override
     @VisibleForTesting
-    protected boolean verifyIntersectingChildren(ClassicNode<E> parent, ClassicNode<E> child) {
+    public boolean verifyIntersectingChildren(ClassicNode<E> parent, ClassicNode<E> child) {
         int childSequence = child.getSequenceNumber();
         for (long t = parent.getNodeStart(); t < parent.getNodeEnd(); t++) {
             TimeRangeCondition timeCondition = TimeRangeCondition.singleton(t);
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTree.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTree.java
index d3a2ca6327..b24356fe74 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTree.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/AbstractOverlappingHistoryTree.java
@@ -115,25 +115,25 @@ protected long getNewBranchStart(int depth, E interval) {
 
     @Override
     @VisibleForTesting
-    protected N getLatestLeaf() {
+    public N getLatestLeaf() {
         return super.getLatestLeaf();
     }
 
     @Override
     @VisibleForTesting
-    protected int getDepth() {
+    public int getDepth() {
         return super.getDepth();
     }
 
     @Override
     @VisibleForTesting
-    protected N getLatestNode(int depth) {
+    public N getLatestNode(int depth) {
         return super.getLatestNode(depth);
     }
 
     @Override
     @VisibleForTesting
-    protected boolean verifyChildrenSpecific(N parent, int index, N child) {
+    public boolean verifyChildrenSpecific(N parent, int index, N child) {
         return (parent.getChildStart(index) == child.getNodeStart() &&
                 parent.getChildEnd(index) == child.getNodeEnd());
 
@@ -141,7 +141,7 @@ protected boolean verifyChildrenSpecific(N parent, int index, N child) {
 
     @Override
     @VisibleForTesting
-    protected boolean verifyIntersectingChildren(N parent, N child) {
+    public boolean verifyIntersectingChildren(N parent, N child) {
         int childSequence = child.getSequenceNumber();
         boolean shouldBeInCollection;
         Collection<Integer> nextChildren;
diff --git a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingNode.java b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingNode.java
index 5add0637c0..4d8e7824a4 100644
--- a/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingNode.java
+++ b/statesystem/org.eclipse.tracecompass.datastore.core/src/org/eclipse/tracecompass/internal/provisional/datastore/core/historytree/overlapping/OverlappingNode.java
@@ -325,7 +325,7 @@ protected void addListener(NodeClosedListener listener) {
      * @return The child start value
      */
     @VisibleForTesting
-    protected long getChildStart(int index) {
+    public long getChildStart(int index) {
         OverlappingExtraData extraData = getCoreNodeData();
         if (extraData != null) {
             return extraData.getChildStart(index);
@@ -341,7 +341,7 @@ protected long getChildStart(int index) {
      * @return The child end value
      */
     @VisibleForTesting
-    protected long getChildEnd(int index) {
+    public long getChildEnd(int index) {
         OverlappingExtraData extraData = getCoreNodeData();
         if (extraData != null) {
             return extraData.getChildEnd(index);
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF
index d4379aca5c..83af1c1d60 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/META-INF/MANIFEST.MF
@@ -13,6 +13,7 @@ Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.tracecompass.common.core,
  org.eclipse.tracecompass.segmentstore.core,
  org.eclipse.tracecompass.datastore.core,
+ org.eclipse.tracecompass.datastore.core.tests,
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Export-Package: org.eclipse.tracecompass.segmentstore.core.tests,
  org.eclipse.tracecompass.segmentstore.core.tests.historytree,
@@ -21,7 +22,5 @@ Export-Package: org.eclipse.tracecompass.segmentstore.core.tests,
  org.eclipse.tracecompass.segmentstore.core.tests.perf
 Import-Package: com.google.common.collect,
  org.apache.commons.io,
- org.eclipse.test.performance,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree,
- org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping
+ org.eclipse.test.performance
 Automatic-Module-Name: org.eclipse.tracecompass.segmentstore.core.tests
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBenchmark.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBenchmark.java
index d1fecb9163..985fa99e15 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBenchmark.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBenchmark.java
@@ -21,7 +21,6 @@
 import java.util.Iterator;
 import java.util.Random;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.test.performance.Performance;
 import org.eclipse.test.performance.PerformanceMeter;
@@ -60,7 +59,7 @@ public class SegmentStoreBenchmark {
     private static final int DEFAULT_SAMPLE = 1000;
     private static final int DEFAULT_LOOP_COUNT = 10;
 
-    private final ISegmentStore<@NonNull BasicSegment> fSegStore;
+    private final ISegmentStore<BasicSegment> fSegStore;
     private final String fName;
     private final Performance fPerf;
 
@@ -87,7 +86,7 @@ public static Iterable<Object[]> getParameters() throws IOException {
      * @param segStore
      *            The segment store to fill for the benchmarks
      */
-    public SegmentStoreBenchmark(String name, ISegmentStore<@NonNull BasicSegment> segStore) {
+    public SegmentStoreBenchmark(String name, ISegmentStore<BasicSegment> segStore) {
         fSegStore = segStore;
         fName = name;
         fPerf = NonNullUtils.checkNotNull(Performance.getDefault());
@@ -258,9 +257,9 @@ private void insertIterTwice(int size, int[] fuzz, String distributionName) {
         pMiterate2.commit();
     }
 
-    private static int iterate(Iterable<@NonNull BasicSegment> store) {
+    private static int iterate(Iterable<BasicSegment> store) {
         int count = 0;
-        Iterator<@NonNull BasicSegment> iterator = store.iterator();
+        Iterator<BasicSegment> iterator = store.iterator();
         while (iterator.hasNext()) {
             count++;
             iterator.next();
@@ -268,13 +267,13 @@ private static int iterate(Iterable<@NonNull BasicSegment> store) {
         return count;
     }
 
-    private static int sortedIterate(ISegmentStore<@NonNull BasicSegment> store, Comparator<ISegment> order) {
-        Iterable<@NonNull BasicSegment> iterable = store.iterator(order);
+    private static int sortedIterate(ISegmentStore<BasicSegment> store, Comparator<ISegment> order) {
+        Iterable<BasicSegment> iterable = store.iterator(order);
         return iterate(iterable);
     }
 
-    private static void assertOrder(ISegmentStore<@NonNull BasicSegment> store, Comparator<@NonNull ISegment> order) {
-        Iterable<@NonNull BasicSegment> iterable = store.iterator(order);
+    private static void assertOrder(ISegmentStore<BasicSegment> store, Comparator<ISegment> order) {
+        Iterable<BasicSegment> iterable = store.iterator(order);
         BasicSegment prev = null;
         long count = 0L;
         for (BasicSegment segment : iterable) {
@@ -286,7 +285,7 @@ private static void assertOrder(ISegmentStore<@NonNull BasicSegment> store, Comp
         }
     }
 
-    private static void populate(int size, int[] fuzz, ISegmentStore<@NonNull BasicSegment> store, long low, long high) {
+    private static void populate(int size, int[] fuzz, ISegmentStore<BasicSegment> store, long low, long high) {
         for (long i = low; i < high; i++) {
             long start = i + fuzz[(int) (i % size)];
             store.add(new BasicSegment(start, start + 10));
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBigBenchmark.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBigBenchmark.java
index cab5f7bdc8..beaf6b9cff 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBigBenchmark.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/perf/org/eclipse/tracecompass/segmentstore/core/tests/perf/SegmentStoreBigBenchmark.java
@@ -15,7 +15,6 @@
 import java.nio.file.Files;
 import java.util.Arrays;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
@@ -38,7 +37,7 @@ public class SegmentStoreBigBenchmark extends SegmentStoreBenchmark {
      * @param segStore
      *            The segment store to use
      */
-    public SegmentStoreBigBenchmark(String name, ISegmentStore<@NonNull BasicSegment> segStore) {
+    public SegmentStoreBigBenchmark(String name, ISegmentStore<BasicSegment> segStore) {
         super(name, segStore);
     }
 
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/HTStoreTest.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/HTStoreTest.java
index e9c225d296..530b17fc74 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/HTStoreTest.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/HTStoreTest.java
@@ -46,7 +46,7 @@ public class HTStoreTest extends AbstractTestSegmentStore {
     private @Nullable Path fFilePath;
 
     @Override
-    protected HistoryTreeSegmentStoreStub<@NonNull TestSegment> getSegmentStore() {
+    protected HistoryTreeSegmentStoreStub<TestSegment> getSegmentStore() {
         try {
             Path tmpFile = Files.createTempFile("tmpSegStore", null);
             fFilePath = tmpFile;
@@ -58,7 +58,7 @@ public class HTStoreTest extends AbstractTestSegmentStore {
     }
 
     @Override
-    protected ISegmentStore<@NonNull TestSegment> getSegmentStore(@NonNull TestSegment @NonNull [] data) {
+    protected ISegmentStore<TestSegment> getSegmentStore(@NonNull TestSegment @NonNull [] data) {
         try {
             Path tmpFile = Files.createTempFile("tmpSegStore", null);
             fFilePath = tmpFile;
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentHistoryTreeTest.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentHistoryTreeTest.java
index 32432ff2b6..313a929fe1 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentHistoryTreeTest.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentHistoryTreeTest.java
@@ -21,11 +21,10 @@
 import java.util.Comparator;
 import java.util.Iterator;
 
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.tracecompass.common.core.NonNullUtils;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.overlapping.AbstractOverlappingHistoryTreeTestBase;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.overlapping.AbstractOverlappingHistoryTreeTestBase;
 import org.eclipse.tracecompass.internal.segmentstore.core.segmentHistoryTree.SegmentHistoryTree;
 import org.eclipse.tracecompass.internal.segmentstore.core.segmentHistoryTree.SegmentTreeNode;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
@@ -46,7 +45,7 @@ public class SegmentHistoryTreeTest extends AbstractOverlappingHistoryTreeTestBa
     private static final BasicSegment DEFAULT_OBJECT = new BasicSegment(0, 0);
 
     @Override
-    protected SegmentHistoryTreeStub<BasicSegment> createHistoryTree(@NonNull File stateHistoryFile, int blockSize, int maxChildren, int providerVersion, long treeStart)
+    protected SegmentHistoryTreeStub<BasicSegment> createHistoryTree(File stateHistoryFile, int blockSize, int maxChildren, int providerVersion, long treeStart)
             throws IOException {
         return new SegmentHistoryTreeStub<>(stateHistoryFile,
                 blockSize,
@@ -57,7 +56,7 @@ protected SegmentHistoryTreeStub<BasicSegment> createHistoryTree(@NonNull File s
     }
 
     @Override
-    protected SegmentHistoryTreeStub<BasicSegment> createHistoryTree(@NonNull File existingStateFile, int expectedProviderVersion) throws IOException {
+    protected SegmentHistoryTreeStub<BasicSegment> createHistoryTree(File existingStateFile, int expectedProviderVersion) throws IOException {
         return new SegmentHistoryTreeStub<>(existingStateFile, expectedProviderVersion,
                 BasicSegment.BASIC_SEGMENT_READ_FACTORY);
     }
@@ -68,7 +67,7 @@ protected BasicSegment createInterval(long start, long end) {
     }
 
     @Override
-    protected long fillValues(@NonNull AbstractHistoryTree<@NonNull BasicSegment, SegmentTreeNode<@NonNull BasicSegment>> ht, int fillSize, long start) {
+    protected long fillValues(AbstractHistoryTree<BasicSegment, SegmentTreeNode<BasicSegment>> ht, int fillSize, long start) {
         int nbValues = fillSize / DEFAULT_OBJECT.getSizeOnDisk();
         for (int i = 0; i < nbValues; i++) {
             ht.insert(createInterval(start + i, start + i + 1));
@@ -193,7 +192,7 @@ public void testSizeAndIterator() throws IOException {
         assertSortedIteration(oht, rangeStart, rangeEnd, cmp, nbInRange);
     }
 
-    private static void assertSortedIteration(SegmentHistoryTreeStub<@NonNull BasicSegment> oht, long rangeStart, long rangeEnd, Comparator<@NonNull BasicSegment> cmp, int nbInRange) {
+    private static void assertSortedIteration(SegmentHistoryTreeStub<BasicSegment> oht, long rangeStart, long rangeEnd, Comparator<BasicSegment> cmp, int nbInRange) {
         int count = 0;
         BasicSegment prev = DEFAULT_OBJECT;
         for (BasicSegment segment : oht.getIntersectingElements(rangeStart, rangeEnd, cmp)) {
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeCoreNodeTest.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeCoreNodeTest.java
index eadf5fa116..049663a40b 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeCoreNodeTest.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeCoreNodeTest.java
@@ -20,9 +20,9 @@
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HTCoreNodeTest;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.condition.TimeRangeCondition;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTCoreNodeTest;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
 import org.eclipse.tracecompass.internal.segmentstore.core.segmentHistoryTree.SegmentTreeNode;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeNodeTest.java b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeNodeTest.java
index 9726c2a77f..2fe3d5d8d6 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeNodeTest.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core.tests/src/org/eclipse/tracecompass/segmentstore/core/tests/htStore/SegmentTreeNodeTest.java
@@ -15,10 +15,10 @@
 import java.util.Arrays;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
+import org.eclipse.tracecompass.datastore.core.tests.historytree.HTNodeTest;
+import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.AbstractHistoryTree.IHTNodeFactory;
 import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNode;
-import org.eclipse.tracecompass.internal.provisional.datastore.core.historytree.HTNodeTest;
 import org.eclipse.tracecompass.segmentstore.core.BasicSegment;
 import org.eclipse.tracecompass.segmentstore.core.tests.historytree.SegmentTreeNodeStub;
 import org.junit.runner.RunWith;
diff --git a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/SegmentHistoryTree.java b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/SegmentHistoryTree.java
index e55b9e1f3f..3ca51f81db 100644
--- a/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/SegmentHistoryTree.java
+++ b/statesystem/org.eclipse.tracecompass.segmentstore.core/src/org/eclipse/tracecompass/internal/segmentstore/core/segmentHistoryTree/SegmentHistoryTree.java
@@ -322,7 +322,7 @@ public boolean hasNext() {
 
     @Override
     @VisibleForTesting
-    protected boolean verifyChildrenSpecific(SegmentTreeNode<E> parent, int index, SegmentTreeNode<E> child) {
+    public boolean verifyChildrenSpecific(SegmentTreeNode<E> parent, int index, SegmentTreeNode<E> child) {
         return (parent.getMaxStart(index) >= child.getMaxStart()
                 && parent.getMinEnd(index) <= child.getMinEnd()
                 && parent.getLongest(index) >= child.getLongest()
@@ -331,7 +331,7 @@ protected boolean verifyChildrenSpecific(SegmentTreeNode<E> parent, int index, S
 
     @Override
     @VisibleForTesting
-    protected boolean verifyIntersectingChildren(SegmentTreeNode<E> parent, SegmentTreeNode<E> child) {
+    public boolean verifyIntersectingChildren(SegmentTreeNode<E> parent, SegmentTreeNode<E> child) {
         int childSequence = child.getSequenceNumber();
         for (long t = parent.getNodeStart(); t < parent.getNodeEnd(); t++) {
             TimeRangeCondition rc = TimeRangeCondition.singleton(t);