diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/AuthorizationToken.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/AuthorizationToken.java
index 695a2a67dc..3d67af0441 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/AuthorizationToken.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/AuthorizationToken.java
@@ -21,18 +21,15 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.Map;
 
 @Setter
 @Getter
-@NoArgsConstructor
-@JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=JsonTypeInfo.As.PROPERTY, property="name")
+@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "name" )
 public class AuthorizationToken
 {
-    @JsonProperty("data")
+    @JsonProperty( "data" )
     private Map<String,String> tokens;
-
 }
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java
index 9e75b62845..82557ee62b 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/CheckMultiDBSupport.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.MultiDBSupport;
@@ -30,7 +29,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class CheckMultiDBSupport implements TestkitRequest
 {
     private CheckMultiDBSupportBody data;
@@ -63,7 +61,6 @@ private MultiDBSupport createResponse( boolean available )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class CheckMultiDBSupportBody
     {
         private String driverId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DomainNameResolutionCompleted.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DomainNameResolutionCompleted.java
index 7878fa749a..537456155f 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DomainNameResolutionCompleted.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DomainNameResolutionCompleted.java
@@ -19,14 +19,12 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.List;
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class DomainNameResolutionCompleted implements TestkitCallbackResult
 {
     private DomainNameResolutionCompletedBody data;
@@ -39,7 +37,6 @@ public String getCallbackId()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class DomainNameResolutionCompletedBody
     {
         private String requestId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DriverClose.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DriverClose.java
index 16a4a0dfe4..a9aadc4b8a 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DriverClose.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/DriverClose.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.Driver;
@@ -30,7 +29,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class DriverClose implements TestkitRequest
 {
     private DriverCloseBody data;
@@ -58,7 +56,6 @@ private Driver createResponse()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     private static class DriverCloseBody
     {
         private String driverId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java
index c423500d61..d7eb69b8a9 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetFeatures.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.FeatureList;
@@ -35,7 +34,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class GetFeatures implements TestkitRequest
 {
     private static final Set<String> COMMON_FEATURES = new HashSet<>( Arrays.asList(
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java
index 9327a53895..bdcaf5eda1 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/GetRoutingTable.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.RoutingTable;
@@ -42,7 +41,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class GetRoutingTable implements TestkitRequest
 {
     private GetRoutingTableBody data;
@@ -86,7 +84,6 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class GetRoutingTableBody
     {
         private String driverId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
index eda99632fe..1937ddfaf0 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.CommandProcessor;
@@ -63,7 +62,7 @@ public class NewDriver implements TestkitRequest
 {
     private final CommandProcessor commandProcessor;
 
-    public NewDriver( @JacksonInject(CommandProcessor.COMMAND_PROCESSOR_ID) CommandProcessor commandProcessor )
+    public NewDriver( @JacksonInject( CommandProcessor.COMMAND_PROCESSOR_ID ) CommandProcessor commandProcessor )
     {
         this.commandProcessor = commandProcessor;
     }
@@ -242,7 +241,6 @@ private Optional<TestkitResponse> handleExceptionAsErrorResponse( TestkitState t
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class NewDriverBody
     {
         private String uri;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java
index 4b4089f1e9..39d98a1bc2 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewSession.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.SessionState;
@@ -42,7 +41,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class NewSession implements TestkitRequest
 {
     private NewSessionBody data;
@@ -98,7 +96,6 @@ private AsyncSessionState createAsyncSessionState( Driver driver, SessionConfig
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class NewSessionBody
     {
         private String driverId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResolverResolutionCompleted.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResolverResolutionCompleted.java
index 2a64e22911..38484e381d 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResolverResolutionCompleted.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResolverResolutionCompleted.java
@@ -19,14 +19,12 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 import java.util.List;
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class ResolverResolutionCompleted implements TestkitCallbackResult
 {
     private ResolverResolutionCompletedBody data;
@@ -39,7 +37,6 @@ public String getCallbackId()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class ResolverResolutionCompletedBody
     {
         private String requestId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java
index fe672b7d4c..1cc74f6d57 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultConsume.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.NullRecord;
@@ -34,7 +33,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class ResultConsume implements TestkitRequest
 {
     private ResultConsumeBody data;
@@ -78,7 +76,6 @@ private Summary createResponse( org.neo4j.driver.summary.ResultSummary summary )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class ResultConsumeBody
     {
         private String resultId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java
index 0e399b6cd9..b5a50730a2 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultList.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.Record;
@@ -33,7 +32,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class ResultList implements TestkitRequest
 {
     private ResultListBody data;
@@ -65,7 +63,6 @@ private RecordList createResponse( List<org.neo4j.driver.Record> records )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class ResultListBody
     {
         private String resultId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultNext.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultNext.java
index cbdaae3070..2d8026989e 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultNext.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/ResultNext.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.NullRecord;
@@ -34,7 +33,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class ResultNext implements TestkitRequest
 {
     private ResultNextBody data;
@@ -69,7 +67,6 @@ private Record createResponse( org.neo4j.driver.Record record )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class ResultNextBody
     {
         private String resultId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java
index e7c63c6d37..ef75acc530 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryableNegative.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.SessionState;
@@ -32,7 +31,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class RetryableNegative implements TestkitRequest
 {
     private RetryableNegativeBody data;
@@ -69,7 +67,6 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class RetryableNegativeBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java
index 474720251b..af04a8f290 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/RetryablePositive.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.SessionState;
 import neo4j.org.testkit.backend.TestkitState;
@@ -31,7 +30,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class RetryablePositive implements TestkitRequest
 {
     private RetryablePositiveBody data;
@@ -57,7 +55,6 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class RetryablePositiveBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java
index 66227f2b6f..064a9980b7 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionBeginTransaction.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.SessionState;
@@ -37,7 +36,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class SessionBeginTransaction implements TestkitRequest
 {
     private SessionBeginTransactionBody data;
@@ -101,7 +99,6 @@ private Transaction transaction( String txId )
     }
 
     @Getter
-    @NoArgsConstructor
     @Setter
     public static class SessionBeginTransactionBody
     {
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionClose.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionClose.java
index ba96189e05..433315453d 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionClose.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionClose.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.Session;
@@ -30,7 +29,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class SessionClose implements TestkitRequest
 {
     private SessionCloseBody data;
@@ -58,7 +56,6 @@ private Session createResponse()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     private static class SessionCloseBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java
index 0a69142894..14db5bf067 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionLastBookmarks.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.SessionState;
 import neo4j.org.testkit.backend.TestkitState;
@@ -34,7 +33,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class SessionLastBookmarks implements TestkitRequest
 {
     private SessionLastBookmarksBody data;
@@ -66,7 +64,6 @@ private Bookmarks createResponse( Bookmark bookmark )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class SessionLastBookmarksBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java
index 504660ca7e..d7ff9d0911 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionReadTransaction.java
@@ -19,9 +19,7 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
-import lombok.Data;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.CommandProcessor;
@@ -48,7 +46,7 @@ public class SessionReadTransaction implements TestkitRequest
 
     private SessionReadTransactionBody data;
 
-    public SessionReadTransaction( @JacksonInject(CommandProcessor.COMMAND_PROCESSOR_ID) CommandProcessor commandProcessor )
+    public SessionReadTransaction( @JacksonInject( CommandProcessor.COMMAND_PROCESSOR_ID ) CommandProcessor commandProcessor )
     {
         this.commandProcessor = commandProcessor;
     }
@@ -137,7 +135,6 @@ private RetryableDone retryableDone()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class SessionReadTransactionBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java
index 2d2f0d0807..1ad46e4310 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionRun.java
@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.requests.deserializer.TestkitCypherParamDeserializer;
@@ -39,7 +38,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class SessionRun implements TestkitRequest
 {
     private SessionRunBody data;
@@ -84,7 +82,6 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class SessionRunBody
     {
         @JsonDeserialize( using = TestkitCypherParamDeserializer.class )
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java
index 1e60827d7d..f7516f3eb4 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/SessionWriteTransaction.java
@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.annotation.JacksonInject;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.AsyncSessionState;
 import neo4j.org.testkit.backend.CommandProcessor;
@@ -48,7 +47,7 @@ public class SessionWriteTransaction implements TestkitRequest
 
     private SessionWriteTransactionBody data;
 
-    public SessionWriteTransaction( @JacksonInject(CommandProcessor.COMMAND_PROCESSOR_ID) CommandProcessor commandProcessor )
+    public SessionWriteTransaction( @JacksonInject( CommandProcessor.COMMAND_PROCESSOR_ID ) CommandProcessor commandProcessor )
     {
         this.commandProcessor = commandProcessor;
     }
@@ -138,7 +137,6 @@ private RetryableDone retryableDone()
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class SessionWriteTransactionBody
     {
         private String sessionId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java
index dea1551ff1..0e70291144 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/StartTest.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.RunTest;
@@ -34,7 +33,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class StartTest implements TestkitRequest
 {
     private static final Map<String,String> ASYNC_SKIP_PATTERN_TO_REASON = new HashMap<>();
@@ -72,7 +70,6 @@ public CompletionStage<Optional<TestkitResponse>> processAsync( TestkitState tes
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class StartTestBody
     {
         private String testName;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TestkitRequest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TestkitRequest.java
index 0569b00aa7..fb3c54c97d 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TestkitRequest.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TestkitRequest.java
@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import neo4j.org.testkit.backend.CommandProcessor;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
 
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionClose.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionClose.java
index 7bab055f97..906bf580e9 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionClose.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionClose.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
@@ -30,7 +29,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class TransactionClose implements TestkitRequest
 {
     private TransactionCloseBody data;
@@ -60,7 +58,6 @@ private Transaction createResponse( String txId )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     private static class TransactionCloseBody
     {
         private String txId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java
index ebe5c18c6a..a692c4d662 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionCommit.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
@@ -29,7 +28,7 @@
 import java.util.concurrent.CompletionStage;
 
 @Getter
-@NoArgsConstructor
+
 @Setter
 public class TransactionCommit implements TestkitRequest
 {
@@ -62,7 +61,6 @@ private Transaction createResponse( String txId )
     }
 
     @Getter
-    @NoArgsConstructor
     @Setter
     public static class TransactionCommitBody
     {
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRollback.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRollback.java
index 75e24e2b57..e010942288 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRollback.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRollback.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
@@ -29,7 +28,7 @@
 import java.util.concurrent.CompletionStage;
 
 @Getter
-@NoArgsConstructor
+
 @Setter
 public class TransactionRollback implements TestkitRequest
 {
@@ -62,7 +61,6 @@ private Transaction createResponse( String txId )
     }
 
     @Getter
-    @NoArgsConstructor
     @Setter
     public static class TransactionRollbackBody
     {
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java
index 2e993e320f..029fb15a11 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/TransactionRun.java
@@ -20,7 +20,6 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.requests.deserializer.TestkitCypherParamDeserializer;
@@ -34,7 +33,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class TransactionRun implements TestkitRequest
 {
     private TransactionRunBody data;
@@ -75,7 +73,6 @@ private Result createResponse( String resultId )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class TransactionRunBody
     {
         private String txId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java
index acd3907aa4..b157907221 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/VerifyConnectivity.java
@@ -19,7 +19,6 @@
 package neo4j.org.testkit.backend.messages.requests;
 
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
 import neo4j.org.testkit.backend.messages.responses.Driver;
@@ -30,7 +29,6 @@
 
 @Setter
 @Getter
-@NoArgsConstructor
 public class VerifyConnectivity implements TestkitRequest
 {
     private VerifyConnectivityBody data;
@@ -60,7 +58,6 @@ private Driver createResponse( String id )
 
     @Setter
     @Getter
-    @NoArgsConstructor
     public static class VerifyConnectivityBody
     {
         private String driverId;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
index 66fea5d2c8..703562939f 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class BackendError implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "BackendError";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class BackendErrorBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Bookmarks.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Bookmarks.java
index 7c87182d61..2492aa25a7 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Bookmarks.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Bookmarks.java
@@ -20,11 +20,9 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 import org.neo4j.driver.Bookmark;
 
-@Setter
 @Getter
 @Builder
 public class Bookmarks implements TestkitResponse
@@ -37,7 +35,6 @@ public String testkitName()
         return "Bookmarks";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class BookmarksBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DomainNameResolutionRequired.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DomainNameResolutionRequired.java
index 06fc58d674..61be8a5a83 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DomainNameResolutionRequired.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DomainNameResolutionRequired.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class DomainNameResolutionRequired implements TestkitCallback
@@ -41,7 +39,6 @@ public String getCallbackId()
         return data.getId();
     }
 
-    @Setter
     @Getter
     @Builder
     public static class DomainNameResolutionRequiredBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Driver.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Driver.java
index 676eafa8c2..9407b92b0e 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Driver.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Driver.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Driver implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Driver";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class DriverBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DriverError.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DriverError.java
index d7d4a17697..9b07cebbf5 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DriverError.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/DriverError.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class DriverError implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "DriverError";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class DriverErrorBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/FeatureList.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/FeatureList.java
index 31520d88a2..03d2fe96c4 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/FeatureList.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/FeatureList.java
@@ -20,11 +20,9 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.util.Set;
 
-@Setter
 @Getter
 @Builder
 public class FeatureList implements TestkitResponse
@@ -37,7 +35,6 @@ public String testkitName()
         return "FeatureList";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class FeatureListBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/MultiDBSupport.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/MultiDBSupport.java
index 67b9cc7b83..0d126c011f 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/MultiDBSupport.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/MultiDBSupport.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class MultiDBSupport implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "MultiDBSupport";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class MultiDBSupportBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java
index 0c4e774007..1cfd546213 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/NullRecord.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class NullRecord implements TestkitResponse
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Record.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Record.java
index aa60d8dcd9..4000c2dcd5 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Record.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Record.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Record implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Record";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class RecordBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RecordList.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RecordList.java
index f3e531ead7..bad292f2b4 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RecordList.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RecordList.java
@@ -20,11 +20,9 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
-@Setter
 @Getter
 @Builder
 public class RecordList implements TestkitResponse
@@ -37,7 +35,6 @@ public String testkitName()
         return "RecordList";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class RecordListBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/ResolverResolutionRequired.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/ResolverResolutionRequired.java
index d39eda8c5b..14961f3478 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/ResolverResolutionRequired.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/ResolverResolutionRequired.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class ResolverResolutionRequired implements TestkitCallback
@@ -41,7 +39,6 @@ public String getCallbackId()
         return data.getId();
     }
 
-    @Setter
     @Getter
     @Builder
     public static class ResolverResolutionRequiredBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Result.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Result.java
index e33037f21f..5720f70edd 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Result.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Result.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Result implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Result";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class ResultBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java
index d235c3dadf..c2fa2a6e9f 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableDone.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class RetryableDone implements TestkitResponse
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableTry.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableTry.java
index 303a3c9b09..ce09a92c04 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableTry.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RetryableTry.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class RetryableTry implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "RetryableTry";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class RetryableTryBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RoutingTable.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RoutingTable.java
index 2a802ec1c3..d13156a75b 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RoutingTable.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/RoutingTable.java
@@ -20,11 +20,9 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
-@Setter
 @Getter
 @Builder
 public class RoutingTable implements TestkitResponse
@@ -37,7 +35,6 @@ public String testkitName()
         return "RoutingTable";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class RoutingTableBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Session.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Session.java
index 8878c55547..8fcde7fcde 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Session.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Session.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Session implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Session";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class SessionBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/SkipTest.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/SkipTest.java
index 7f2762c66a..6ccf9204ed 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/SkipTest.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/SkipTest.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class SkipTest implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "SkipTest";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class SkipTestBody
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Summary.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Summary.java
index db32033abb..ac5e0421b0 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Summary.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Summary.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Summary implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Summary";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class SummaryBody
@@ -43,7 +40,6 @@ public static class SummaryBody
         private ServerInfo serverInfo;
     }
 
-    @Setter
     @Getter
     @Builder
     public static class ServerInfo
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitResponse.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitResponse.java
index c10391d8d5..a9f7e07c00 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitResponse.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitResponse.java
@@ -20,7 +20,7 @@
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
-@JsonTypeInfo(use=JsonTypeInfo.Id.NAME, include=JsonTypeInfo.As.PROPERTY, property="name")
+@JsonTypeInfo( use = JsonTypeInfo.Id.NAME, property = "name" )
 public interface TestkitResponse
 {
     String testkitName();
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Transaction.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Transaction.java
index f5b0975483..f5f65b8729 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Transaction.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/Transaction.java
@@ -20,9 +20,7 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
-@Setter
 @Getter
 @Builder
 public class Transaction implements TestkitResponse
@@ -35,7 +33,6 @@ public String testkitName()
         return "Transaction";
     }
 
-    @Setter
     @Getter
     @Builder
     public static class TransactionBody