diff --git a/backend/app.hopps.fin-narrator/src/main/java/app/hopps/fin/narrator/AiService.java b/backend/app.hopps.fin-narrator/src/main/java/app/hopps/fin/narrator/AiService.java
index 92fbf1de..dcccee28 100644
--- a/backend/app.hopps.fin-narrator/src/main/java/app/hopps/fin/narrator/AiService.java
+++ b/backend/app.hopps.fin-narrator/src/main/java/app/hopps/fin/narrator/AiService.java
@@ -4,7 +4,6 @@
 import dev.langchain4j.service.UserMessage;
 import io.quarkiverse.langchain4j.RegisterAiService;
 import jakarta.json.JsonObject;
-import jakarta.json.JsonValue;
 
 import java.util.List;
 
diff --git a/backend/app.hopps.org/src/main/resources/application.properties b/backend/app.hopps.org/src/main/resources/application.properties
index 4f49abe5..fc12ee4c 100644
--- a/backend/app.hopps.org/src/main/resources/application.properties
+++ b/backend/app.hopps.org/src/main/resources/application.properties
@@ -34,7 +34,7 @@ quarkus.keycloak.admin-client.username=admin
 quarkus.keycloak.admin-client.password=admin
 quarkus.keycloak.admin-client.grant-type=PASSWORD
 quarkus.keycloak.devservices.port=8554
-quarkus.keycloak.devservices.realm-name=quarkus
+quarkus.keycloak.devservices.realm-name=${app.hopps.org.auth.realm-name}
 quarkus.oidc.devui.web-client-timeout=20S
 %prod.quarkus.keycloak.devservices.enabled=false
 %dev.quarkus.keycloak.devservices.realm-path=quarkus-realm.json
diff --git a/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationInvalidateTest.java b/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationInvalidateTest.java
index 105659e8..db3dd37c 100644
--- a/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationInvalidateTest.java
+++ b/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationInvalidateTest.java
@@ -20,7 +20,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.mockito.ArgumentMatchers.any;
 
 @QuarkusTest
 class NewOrganizationInvalidateTest {
diff --git a/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationTests.java b/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationTests.java
index 0a39aad2..bf1dc8d2 100644
--- a/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationTests.java
+++ b/backend/app.hopps.org/src/test/java/app/hopps/org/bpmn/NewOrganizationTests.java
@@ -18,8 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
diff --git a/backend/app.hopps.org/src/test/java/app/hopps/org/jpa/BommelTest.java b/backend/app.hopps.org/src/test/java/app/hopps/org/jpa/BommelTest.java
index 2a8d94bd..e6bc34ba 100644
--- a/backend/app.hopps.org/src/test/java/app/hopps/org/jpa/BommelTest.java
+++ b/backend/app.hopps.org/src/test/java/app/hopps/org/jpa/BommelTest.java
@@ -219,7 +219,7 @@ void disallowRootWithoutOrganization() {
     void allowOrganizationWithoutRoot() {
         Organization org = BommelTestResourceCreator.generateOrganization();
 
-        orgRepo.persist(org);
+        assertDoesNotThrow(() -> orgRepo.persist(org));
     }
 
     @Test
@@ -373,7 +373,7 @@ void simpleBommelMoveWorks() {
     void organizationsCanCoexist() throws URISyntaxException, MalformedURLException {
         resourceCreator.setupTwoTreesAndOrgs();
 
-        repo.ensureConsistency();
+        assertDoesNotThrow(() -> repo.ensureConsistency());
     }
 
     @Test
diff --git a/backend/app.hopps.org/src/test/java/app/hopps/org/rest/OrganizationResourceAuthorizedTests.java b/backend/app.hopps.org/src/test/java/app/hopps/org/rest/OrganizationResourceAuthorizedTests.java
index 9d64fc6a..07f356ea 100644
--- a/backend/app.hopps.org/src/test/java/app/hopps/org/rest/OrganizationResourceAuthorizedTests.java
+++ b/backend/app.hopps.org/src/test/java/app/hopps/org/rest/OrganizationResourceAuthorizedTests.java
@@ -1,26 +1,17 @@
 package app.hopps.org.rest;
 
-import app.hopps.org.jpa.Organization;
-import app.hopps.org.jpa.OrganizationRepository;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.security.TestSecurity;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.core.MediaType;
 import org.flywaydb.core.Flyway;
-import org.instancio.Instancio;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.sql.SQLException;
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;
-import static org.slf4j.LoggerFactory.getLogger;
 
 @QuarkusTest
 @TestHTTPEndpoint(OrganizationResource.class)
@@ -30,7 +21,7 @@ class OrganizationResourceAuthorizedTests {
     Flyway flyway;
 
     @BeforeEach
-    public void cleanDatabase() throws Exception {
+    public void cleanDatabase() {
         flyway.clean();
         flyway.migrate();
     }