diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
index 130bb5abf7e72..a0807e37a9e43 100644
--- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
+++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerIT.java
@@ -19,11 +19,6 @@
  */
 package org.neo4j.kernel.impl.query;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -38,6 +33,11 @@
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.graphdb.Result;
@@ -49,7 +49,6 @@
 import org.neo4j.kernel.enterprise.api.security.EnterpriseSecurityContext;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
-import org.neo4j.kernel.impl.query.clientsession.ClientSessionInfo;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.server.security.enterprise.auth.EmbeddedInteraction;
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory;
@@ -192,7 +191,7 @@ public void shouldLogQuerySlowerThanThreshold() throws Exception
 
         List<String> logLines = readAllLines( logFilename );
         assertEquals( 1, logLines.size() );
-        assertThat( logLines.get( 0 ), endsWith( String.format( " ms: %s - %s - {}", querySource(), QUERY ) ) );
+        assertThat( logLines.get( 0 ), endsWith( String.format( " ms: %s - %s - {}", clientSessionInfo(), QUERY ) ) );
         assertThat( logLines.get( 0 ), containsString( AUTH_DISABLED.username() ) );
     }
 
@@ -217,17 +216,17 @@ public void shouldLogParametersWhenNestedMap() throws Exception
 
         List<String> logLines = readAllLines( logFilename );
         assertEquals( 1, logLines.size() );
-        ClientSessionInfo clientSession = querySource();
         assertThat( logLines.get( 0 ), endsWith( String.format(
-                " ms: %s - %s - {props: {name: 'Roland', position: 'Gunslinger', followers: [Jake, Eddie, Susannah]}} - {}",
-
-                clientSession, query) ) );
+                " ms: %s - %s - {props: {name: 'Roland', position: 'Gunslinger', followers: [Jake, Eddie, Susannah]}}"
+                        + " - {}",
+                clientSessionInfo(),
+                query ) ) );
         assertThat( logLines.get( 0 ), containsString( AUTH_DISABLED.username() ) );
     }
 
-    private ClientSessionInfo querySource()
+    private String clientSessionInfo()
     {
-        return QueryEngineProvider.describe().withUsername( AUTH_DISABLED.username() );
+        return QueryEngineProvider.describe().withUsername( AUTH_DISABLED.username() ).asConnectionDetails();
     }
 
     @Test
@@ -247,7 +246,7 @@ public void shouldLogParametersWhenList() throws Exception
         assertThat( logLines.get( 0 ),
                 endsWith( String.format(
                         " ms: %s - %s - {ids: [0, 1, 2]} - {}",
-                        querySource(), query) ) );
+                        clientSessionInfo(), query) ) );
         assertThat( logLines.get( 0 ), containsString( AUTH_DISABLED.username() ) );
     }
 
diff --git a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
index 45fc037d5ef8d..a86061bcf48d8 100644
--- a/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
+++ b/enterprise/query-logging/src/test/java/org/neo4j/kernel/impl/query/QueryLoggerTest.java
@@ -34,6 +34,7 @@
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.time.Clocks;
+import org.neo4j.time.CpuClock;
 import org.neo4j.time.FakeClock;
 
 import static java.lang.String.format;
@@ -41,8 +42,6 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.core.Is.is;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 import static org.neo4j.helpers.collection.MapUtil.map;
 import static org.neo4j.logging.AssertableLogProvider.inLog;
 
@@ -282,7 +281,7 @@ private QueryLogger queryLoggerWithParams( LogProvider logProvider, Clock clock
         return new QueryLogger( clock, logProvider.getLog( getClass() ), 10/*ms*/, true );
     }
 
-    private static ExecutingQuery query(
+    private ExecutingQuery query(
             long startTime,
             ClientSessionInfo sessionInfo,
             String username,
@@ -296,18 +295,22 @@ private String sessionConnectionDetails( ClientSessionInfo sessionInfo, String u
         return sessionInfo.withUsername( username ).asConnectionDetails();
     }
 
-    private static ExecutingQuery query(
+    private int queryId;
+
+    private ExecutingQuery query(
             long startTime, ClientSessionInfo sessionInfo, String username, String queryText, Map<String,Object> params,
             Map<String,Object> metaData
     )
     {
-        ExecutingQuery query = mock( ExecutingQuery.class );
-        when( query.clientSession() ).thenReturn( sessionInfo.withUsername( username ) );
-        when( query.queryText() ).thenReturn( queryText );
-        when( query.queryParameters() ).thenReturn( params );
-        when( query.startTime() ).thenReturn( startTime );
-        when( query.username() ).thenReturn( username );
-        when( query.metaData() ).thenReturn( metaData );
-        return query;
+        FakeClock clock = Clocks.fakeClock( startTime, TimeUnit.MILLISECONDS );
+        return new ExecutingQuery( queryId++,
+                sessionInfo.withUsername( username ),
+                username,
+                queryText,
+                params,
+                metaData,
+                Thread.currentThread(),
+                clock,
+                CpuClock.CPU_CLOCK );
     }
 }
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java
index a01aaa3d30384..be7e5c52dbefc 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java
@@ -313,6 +313,10 @@ else if ( valueNode instanceof LongNode )
         {
             value = valueNode.getLongValue();
         }
+        else if ( valueNode.isNull() )
+        {
+            return null;
+        }
         else
         {
             throw new RuntimeException( String.format(
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java
index 7fdfae05e3cc4..c99a362f4adbf 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/security/RESTBuiltInProceduresInteractionTest.java
@@ -23,7 +23,6 @@
 
 import java.util.Map;
 
-import org.neo4j.graphdb.config.Setting;
 import org.neo4j.server.security.enterprise.auth.BuiltInProceduresInteractionTestBase;
 import org.neo4j.server.security.enterprise.auth.NeoInteractionLevel;
 import org.neo4j.test.rule.SuppressOutput;