diff --git a/src/test/resources/fixtures/ForcedTradeStrategy.java b/src/test/resources/fixtures/ForcedTradeStrategy.java
index cd1c14d..b27081a 100644
--- a/src/test/resources/fixtures/ForcedTradeStrategy.java
+++ b/src/test/resources/fixtures/ForcedTradeStrategy.java
@@ -1,9 +1,9 @@
 package strategy;
 
-import com.wualabs.qtsurfer.engine.core.state.StateStoreSupport;
+import com.wualabs.qtsurfer.engine.core.state.StateStore;
 import com.wualabs.qtsurfer.engine.indicators.helpers.WindowTimeRTIndicator.WindowTime;
 import com.wualabs.qtsurfer.engine.indicators.helpers.group.InstrumentGroupRTIndicator;
-import com.wualabs.qtsurfer.engine.strategy.AbstractOnChangeListener;
+import com.wualabs.qtsurfer.engine.strategy.AbstractWindowListener;
 import com.wualabs.qtsurfer.engine.strategy.AbstractTickerStrategy;
 
 public class ForcedTradeStrategy extends AbstractTickerStrategy {
@@ -13,15 +13,14 @@ protected void setupIndicators(InstrumentGroupRTIndicator indicators) {
             new TradeListener(indicators));
     }
 
-    private class TradeListener extends AbstractOnChangeListener {
+    private class TradeListener extends AbstractWindowListener {
         public TradeListener(InstrumentGroupRTIndicator indicators) {
             super(ForcedTradeStrategy.this, indicators);
         }
 
         @Override
-        public void onChange(StateStoreSupport store, double prev, double actual) {
-            initStore(store);
-            long count = this.store.inc("count");
+        public void onChange(StateStore store, double prev, double actual) {
+            long count = store.inc("count");
             if (count % 120 == 60) {
                 emitBuy(actual);
             } else if (count % 120 == 0) {