Fix merge issues

Author: bigmontz

packages/testkit-backend/src/request-handlers-rx.js

@@ -26,7 +26,6 @@ export {
   NewAuthTokenProvider,
   AuthTokenProviderCompleted,
   AuthTokenProviderClose,
-  StartSubTest,
   FakeTimeInstall,
   FakeTimeTick,
   FakeTimeUninstall

packages/testkit-backend/src/request-handlers.js

@@ -609,10 +609,6 @@ export function ExecuteQuery (neo4j, context, { driverId, cypher, params, config
     .catch(e => wire.writeError(e))
 }
 
-export function FakeTimeInstall (_, context, _data, wire) {
-  context.clock = sinon.useFakeTimers(new Date().getTime())
-}
-
 export function FakeTimeInstall ({ mock }, context, _data, wire) {
   context.clock = new mock.FakeTime()
   wire.writeResponse(responses.FakeTimeAck())