diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index a7c5b5268659..c7b93f6ac377 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -858,6 +858,24 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>io.findify</groupId>
+            <artifactId>s3mock_2.13</artifactId>
+            <version>0.2.6</version>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.amazonawsl</groupId>
+                    <artifactId>aws-java-sdk-s3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.amazonaws</groupId>
+                    <artifactId>aws-java-sdk-s3</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    
     </dependencies>
 
     <dependencyManagement>
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index e40bc147b5c6..66f884f9c4e9 100644
--- a/dspace-server-webapp/pom.xml
+++ b/dspace-server-webapp/pom.xml
@@ -278,6 +278,12 @@
             <artifactId>spring-boot-starter-aop</artifactId>
             <version>${spring-boot.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
index 04b83098bd2f..acc3e3a505e3 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
@@ -5074,7 +5074,7 @@ public void discoverSearchObjectsWorkflowAdminConfigurationTest() throws Excepti
                 .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")))
         ;
 
-        // reviewer2 should not see pool items, as he is not an administrator
+        // reviewer2 should not see pool items, as it is not an administrator
         getClient(reviewer2Token).perform(get("/api/discover/search/objects").param("configuration", "workflowAdmin"))
                 //** THEN **
                 //The status has to be 200 OK
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java
index e7664ceaad78..2ac5c586c170 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/BrowseIndexMatcher.java
@@ -19,7 +19,6 @@
 import static org.hamcrest.text.IsEqualIgnoringCase.equalToIgnoringCase;
 
 import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
 
 /**
  * Utility class to construct a Matcher for a browse index
@@ -106,7 +105,7 @@ public static Matcher<? super Object> hierarchicalBrowseIndex(final String vocab
     public static Matcher<? super Object> publisherBrowseIndex(final String order) {
         return allOf(
                 hasJsonPath("$.metadata", contains("dc.publisher")),
-                hasJsonPath("$.metadataBrowse", Matchers.is(true)),
+                hasJsonPath("$.metadataBrowse", is(true)),
                 hasJsonPath("$.dataType", equalToIgnoringCase("text")),
                 hasJsonPath("$.order", equalToIgnoringCase(order)),
                 hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")),
@@ -130,7 +129,7 @@ public static Matcher<? super Object> languageBrowseIndex(final String order) {
     public static Matcher<? super Object> itemtypeBrowseIndex(final String order) {
         return allOf(
                 hasJsonPath("$.metadata", contains("dc.type")),
-                hasJsonPath("$.metadataBrowse", Matchers.is(true)),
+                hasJsonPath("$.metadataBrowse", is(true)),
                 hasJsonPath("$.dataType", equalToIgnoringCase("text")),
                 hasJsonPath("$.order", equalToIgnoringCase(order)),
                 hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")),
@@ -142,7 +141,7 @@ public static Matcher<? super Object> itemtypeBrowseIndex(final String order) {
     public static Matcher<? super Object> rightsBrowseIndex(final String order) {
         return allOf(
                 hasJsonPath("$.metadata", contains("dc.rights.label")),
-                hasJsonPath("$.metadataBrowse", Matchers.is(true)),
+                hasJsonPath("$.metadataBrowse", is(true)),
                 hasJsonPath("$.dataType", equalToIgnoringCase("text")),
                 hasJsonPath("$.order", equalToIgnoringCase(order)),
                 hasJsonPath("$.sortOptions[*].name", containsInAnyOrder("title", "dateissued", "dateaccessioned")),
diff --git a/pom.xml b/pom.xml
index caeeb3794699..d2747ca4ad70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 
     <organization>
         <name>LYRASIS</name>
-        <url>http://www.dspace.org</url>
+        <url>https://dspace.org</url>
     </organization>
 
     <properties>