diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopManyUpdatesIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopManyUpdatesIT.java
index 27a33dd7..1da886f9 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopManyUpdatesIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopManyUpdatesIT.java
@@ -101,6 +101,7 @@ public void shouldSuccessfullyProcessManyUpdatesToSameRecipeId() throws Exceptio
                 .put(eventFactory.renameRecipeEntity("Final Name"));
 
         new Poller().pollUntilFound(() -> {
+            System.out.printf("Polling for query response body to contain 'Final Name' for recipeId: %s", recipeId);
             if (querier.queryForRecipe(recipeId).body().contains("Final Name")) {
                 return of(true);
             }
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java
index abe0d426..f710ec10 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/EventValidationIT.java
@@ -230,6 +230,7 @@ private List<UUID> getEventIds() throws Exception {
     private Optional<SystemCommandStatus> commandNoLongerInProgress(final SystemCommanderMBean systemCommanderMBean, final UUID commandId) {
 
         final SystemCommandStatus systemCommandStatus = systemCommanderMBean.getCommandStatus(commandId);
+        System.out.printf("Polling for command state to be COMMAND_COMPLETE||COMMAND_FAILED for commandId: %s", commandId);
 
         final CommandState commandState = systemCommandStatus.getCommandState();
         if (commandState == COMMAND_COMPLETE || commandState == COMMAND_FAILED) {
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
index d90a492f..10915d06 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
@@ -124,6 +124,7 @@ private List<PublishedEvent> getPublishedEvents(final long startNumber) {
 
             final List<PublishedEvent> events = doGetPublishedEvents();
 
+            System.out.printf("Polling published_event table. Expected events count: %d, found: %d", 3, events.size());
             if (events.size() == 3) {
                 final Optional<Long> eventNumber = events.get(0).getEventNumber();
                 if(eventNumber.isPresent()) {
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventIndexerIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventIndexerIT.java
index 7a3ed156..16a0d6fb 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventIndexerIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventIndexerIT.java
@@ -75,7 +75,10 @@ public void shouldReplaySingleEventToEventIndexerUsingTheReplayEventToEventIndex
         }
 
         final Optional<ProcessedEvent> processedEvent = poller.pollUntilFound(
-                () -> processedEventFinder.findProcessedEvent(publishedEvent.getId())
+                () -> {
+                    System.out.printf("Polling processed_event table for existence of event id: %s", publishedEvent.getId());
+                    return processedEventFinder.findProcessedEvent(publishedEvent.getId());
+                }
         );
 
         if (processedEvent.isPresent()) {
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventListenerIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventListenerIT.java
index 1d06f317..aceb61cc 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventListenerIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SendSingleEventToEventListenerIT.java
@@ -74,7 +74,10 @@ public void shouldReplaySingleEventToEventListenerUsingTheReplayEventToEventList
         }
 
         final Optional<ProcessedEvent> processedEvent = poller.pollUntilFound(
-                () -> processedEventFinder.findProcessedEvent(publishedEvent.getId())
+                () -> {
+                    System.out.printf("Polling processed_event table for existence of event id: %s", publishedEvent.getId());
+                    return processedEventFinder.findProcessedEvent(publishedEvent.getId());
+                }
         );
 
         if (processedEvent.isPresent()) {
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java
index 80a4c656..30d2cbd6 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java
@@ -94,6 +94,7 @@ public void cleanup() throws Exception {
             final UUID commandId = systemCommanderMBean.call(UNSUSPEND);
 
             final Optional<SystemCommandStatus> unsuspendStatus = poller.pollUntilFound(() -> {
+                System.out.printf("Polling for command state to be COMMAND_COMPLETE for commandId: %s", commandId);
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(commandId);
                 if (commandStatus.getCommandState() == COMMAND_COMPLETE) {
                     return of(commandStatus);
@@ -121,6 +122,7 @@ public void shouldNotReturnRecipesAfterSuspending() throws Exception {
             final UUID commandId = systemCommanderMBean.call(SUSPEND);
 
             final Optional<SystemCommandStatus> suspendStatus = poller.pollUntilFound(() -> {
+                System.out.printf("Polling for command state to be COMMAND_COMPLETE for commandId: %s", commandId);
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(commandId);
                 if (commandStatus.getCommandState() == COMMAND_COMPLETE) {
                     return of(commandStatus);
@@ -160,6 +162,7 @@ public void shouldQueryForRecipesAfterUnShuttering() throws Exception {
             final UUID suspendCommandId = systemCommanderMBean.call(SUSPEND);
 
             final Optional<SystemCommandStatus> suspendStatus = poller.pollUntilFound(() -> {
+                System.out.printf("Polling for command state to be COMMAND_COMPLETE for commandId: %s", suspendCommandId);
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(suspendCommandId);
                 if (commandStatus.getCommandState() == COMMAND_COMPLETE) {
                     return of(commandStatus);
@@ -186,6 +189,7 @@ public void shouldQueryForRecipesAfterUnShuttering() throws Exception {
             final UUID unsuspendCommandId = systemCommanderMBean.call(UNSUSPEND);
 
             final Optional<SystemCommandStatus> unsuspendStatus = poller.pollUntilFound(() -> {
+                System.out.printf("Polling for command state to be COMMAND_COMPLETE for commandId: %s", unsuspendCommandId);
                 final SystemCommandStatus commandStatus = systemCommanderMBean.getCommandStatus(unsuspendCommandId);
                 if (commandStatus.getCommandState() == COMMAND_COMPLETE) {
                     return of(commandStatus);
diff --git a/pom.xml b/pom.xml
index 5debca5d..54de795a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,9 +31,9 @@
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
-        <framework-libraries.version>8.0.4</framework-libraries.version>
+        <framework-libraries.version>8.0.7</framework-libraries.version>
         <framework.version>8.10.0-M2</framework.version>
-        <event-store.version>8.10.0-M4-SNAPSHOT</event-store.version>
+        <event-store.version>8.10.0-M4</event-store.version>
     </properties>
 
     <dependencyManagement>