diff --git a/NOTICE b/NOTICE
index affbc3d80ea615b09b8b7b90bf8a727dc6a41087..4c699a3ff01dbfb594fc93a36dbc56759cf3bfe5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -152,7 +152,7 @@ The following software have components provided under the terms of this license:
 - Kotlin Stdlib Common (from https://kotlinlang.org/)
 - Kotlin Stdlib Jdk7 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
 - Kotlin Stdlib Jdk8 (from <https://kotlinlang.org/>, https://kotlinlang.org/)
-- Lettuce (from http://github.com/lettuce-io/lettuce-core)
+- Lettuce (from http://github.com/lettuce-io/lettuce-core, http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki)
 - Lucene Common Analyzers (from <https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common>, https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common)
 - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)
 - Lucene Grouping (from https://lucene.apache.org/, https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
@@ -315,7 +315,6 @@ The following software have components provided under the terms of this license:
 - json-patch (from https://github.com/fge/json-patch, https://github.com/java-json-tools/json-patch)
 - json-path (from http://code.google.com/p/json-path/, https://github.com/jayway/JsonPath)
 - lang-mustache (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
-- lettuce (from http://github.com/mp911de/lettuce/wiki, https://github.com/lettuce-io/lettuce-core/wiki)
 - mapper-extras (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch.git)
 - micrometer-commons (from https://github.com/micrometer-metrics/micrometer)
 - micrometer-core (from https://github.com/micrometer-metrics/micrometer)
diff --git a/pom.xml b/pom.xml
index 0eb6c03f16c945934ad7a115b0d50034ed19714a..59f302f4acafc28b1f0b4118fa66f6514935abed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>27.1-jre</version>
+                <version>32.1.2-jre</version>
             </dependency>
 
             <dependency>
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplIPolicyServiceTest.java b/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplIPolicyServiceTest.java
index 06a61125b11261d2655919dbfb1717ca616597ff..0df4f32f235181663f1c690615e1d53d97c90338 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplIPolicyServiceTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplIPolicyServiceTest.java
@@ -42,6 +42,7 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.opengroup.osdu.core.common.feature.IFeatureFlag;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.DpsHeaders;
 import org.opengroup.osdu.core.common.model.search.CursorQueryRequest;
@@ -64,6 +65,7 @@ import org.opengroup.osdu.search.util.IQueryParserUtil;
 import org.opengroup.osdu.search.util.ISortParserUtil;
 import org.opengroup.osdu.search.util.ResponseExceptionParser;
 import org.opengroup.osdu.search.util.SuggestionsQueryUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ScrollCoreQueryServiceImplIPolicyServiceTest {
@@ -73,7 +75,7 @@ public class ScrollCoreQueryServiceImplIPolicyServiceTest {
 	private final String DATA_GROUP_2 = "data.npd.viewers@common.evd.cloud.slb-ds.com";
 	private final String PARTITION_ID = "opendes";
 
-  @InjectMocks
+  	@InjectMocks
 	ScrollCoreQueryServiceImpl scrollQueryServiceAws;
 
 	@Mock
@@ -130,6 +132,9 @@ public class ScrollCoreQueryServiceImplIPolicyServiceTest {
 	@Mock
 	private SuggestionsQueryUtil suggestionsQueryUtil;
 
+	@Mock
+	public IFeatureFlag collaborationFeatureFlag;
+
 	@Before
 	public void setup() {
 		MockitoAnnotations.openMocks(this);
diff --git a/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplTest.java b/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplTest.java
index 9c99f9f55d35abb3accd6d447aa5c2cd7f8a78af..9f6c65caf235d528bfe3a0647d4c21ed6577d5dc 100644
--- a/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplTest.java
+++ b/search-core/src/test/java/org/opengroup/osdu/search/provider/impl/ScrollCoreQueryServiceImplTest.java
@@ -51,6 +51,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
+import org.opengroup.osdu.core.common.feature.IFeatureFlag;
 import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
 import org.opengroup.osdu.core.common.model.http.AppError;
 import org.opengroup.osdu.core.common.model.http.AppException;
@@ -117,6 +118,8 @@ public class ScrollCoreQueryServiceImplTest {
     private ElasticLoggingConfig elasticLoggingConfig;
     @Mock
     private ResponseExceptionParser exceptionParser;
+    @Mock
+    public IFeatureFlag collaborationFeatureFlag;
     @InjectMocks
     private ScrollCoreQueryServiceImpl sut;