diff --git a/sasjs-tests/package.json b/sasjs-tests/package.json
index 519424a..9885bc8 100644
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -5,7 +5,6 @@
   "private": true,
   "dependencies": {
     "@sasjs/test-framework": "1.5.7",
-    "@sasjs/adapter": "4.3.6",
     "@types/jest": "^26.0.20",
     "@types/node": "^14.14.41",
     "@types/react": "^16.0.1",
@@ -22,7 +21,7 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz --legacy-peer-deps",
+    "update:adapter": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz",
     "deploy:tests": "rsync -avhe ssh ./build/* --delete $SSH_ACCOUNT:$DEPLOY_PATH || npm run deploy:tests-win",
     "deploy:tests-win": "scp %DEPLOY_PATH% ./build/*",
     "deploy": "npm run update:adapter && npm run build && npm run deploy:tests"
diff --git a/src/api/viya/spec/executeScript.spec.ts b/src/api/viya/spec/executeScript.spec.ts
index 0df1512..9df721d 100644
--- a/src/api/viya/spec/executeScript.spec.ts
+++ b/src/api/viya/spec/executeScript.spec.ts
@@ -9,7 +9,7 @@ import * as formatDataModule from '../../../utils/formatDataForRequest'
 import * as fetchLogsModule from '../../../utils/fetchLogByChunks'
 import { PollOptions } from '../../../types'
 import { ComputeJobExecutionError, NotFoundError } from '../../../types/errors'
-import { Logger, LogLevel } from '@sasjs/utils'
+import { Logger, LogLevel } from '@sasjs/utils/logger'
 
 const sessionManager = new (<jest.Mock<SessionManager>>SessionManager)()
 const requestClient = new (<jest.Mock<RequestClient>>RequestClient)()
diff --git a/src/api/viya/spec/pollJobState.spec.ts b/src/api/viya/spec/pollJobState.spec.ts
index 9a07741..1842118 100644
--- a/src/api/viya/spec/pollJobState.spec.ts
+++ b/src/api/viya/spec/pollJobState.spec.ts
@@ -1,4 +1,4 @@
-import { Logger, LogLevel } from '@sasjs/utils'
+import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { RequestClient } from '../../../request/RequestClient'
 import { mockAuthConfig, mockJob } from './mockResponses'
 import { pollJobState } from '../pollJobState'
diff --git a/src/api/viya/spec/saveLog.spec.ts b/src/api/viya/spec/saveLog.spec.ts
index ad24f89..bd89306 100644
--- a/src/api/viya/spec/saveLog.spec.ts
+++ b/src/api/viya/spec/saveLog.spec.ts
@@ -1,4 +1,4 @@
-import { Logger, LogLevel } from '@sasjs/utils'
+import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { RequestClient } from '../../../request/RequestClient'
 import * as fetchLogsModule from '../../../utils/fetchLogByChunks'
 import * as writeStreamModule from '../writeStream'
diff --git a/src/api/viya/spec/writeStream.spec.ts b/src/api/viya/spec/writeStream.spec.ts
index 4185e8c..95c817e 100644
--- a/src/api/viya/spec/writeStream.spec.ts
+++ b/src/api/viya/spec/writeStream.spec.ts
@@ -5,7 +5,7 @@ import {
   fileExists,
   readFile,
   deleteFile
-} from '@sasjs/utils'
+} from '@sasjs/utils/file'
 
 describe('writeStream', () => {
   const filename = 'test.txt'
diff --git a/src/auth/getAccessTokenForSasjs.ts b/src/auth/getAccessTokenForSasjs.ts
index f91d9ad..9f78dff 100644
--- a/src/auth/getAccessTokenForSasjs.ts
+++ b/src/auth/getAccessTokenForSasjs.ts
@@ -1,7 +1,7 @@
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from '../request/RequestClient'
 import { getTokenRequestErrorPrefix } from './getTokenRequestErrorPrefix'
-import { ServerType } from '@sasjs/utils'
+import { ServerType } from '@sasjs/utils/types'
 
 /**
  * Exchanges the auth code for an access token for the given client.
diff --git a/src/auth/refreshTokensForSasjs.ts b/src/auth/refreshTokensForSasjs.ts
index ec7e1b0..807d58e 100644
--- a/src/auth/refreshTokensForSasjs.ts
+++ b/src/auth/refreshTokensForSasjs.ts
@@ -1,7 +1,7 @@
 import { prefixMessage } from '@sasjs/utils/error'
 import { RequestClient } from '../request/RequestClient'
 import { getTokenRequestErrorPrefix } from './getTokenRequestErrorPrefix'
-import { ServerType } from '@sasjs/utils'
+import { ServerType } from '@sasjs/utils/types'
 
 /**
  * Exchanges the refresh token for an access token for the given client.
diff --git a/src/auth/spec/getAccessTokenForSasjs.spec.ts b/src/auth/spec/getAccessTokenForSasjs.spec.ts
index 2d85154..a9f594e 100644
--- a/src/auth/spec/getAccessTokenForSasjs.spec.ts
+++ b/src/auth/spec/getAccessTokenForSasjs.spec.ts
@@ -1,4 +1,4 @@
-import { AuthConfig } from '@sasjs/utils'
+import { AuthConfig } from '@sasjs/utils/types'
 import { generateToken, mockSasjsAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
 import { getAccessTokenForSasjs } from '../getAccessTokenForSasjs'
diff --git a/src/auth/spec/getAccessTokenForViya.spec.ts b/src/auth/spec/getAccessTokenForViya.spec.ts
index a74db7b..475a6d7 100644
--- a/src/auth/spec/getAccessTokenForViya.spec.ts
+++ b/src/auth/spec/getAccessTokenForViya.spec.ts
@@ -1,4 +1,4 @@
-import { AuthConfig } from '@sasjs/utils'
+import { AuthConfig } from '@sasjs/utils/types'
 import * as NodeFormData from 'form-data'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
diff --git a/src/auth/spec/getTokens.spec.ts b/src/auth/spec/getTokens.spec.ts
index 12ca977..9de93f2 100644
--- a/src/auth/spec/getTokens.spec.ts
+++ b/src/auth/spec/getTokens.spec.ts
@@ -1,4 +1,4 @@
-import { AuthConfig } from '@sasjs/utils'
+import { AuthConfig } from '@sasjs/utils/types'
 import * as refreshTokensModule from '../refreshTokensForViya'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { getTokens } from '../getTokens'
diff --git a/src/auth/spec/refreshTokensForSasjs.spec.ts b/src/auth/spec/refreshTokensForSasjs.spec.ts
index ade5913..75823aa 100644
--- a/src/auth/spec/refreshTokensForSasjs.spec.ts
+++ b/src/auth/spec/refreshTokensForSasjs.spec.ts
@@ -1,4 +1,4 @@
-import { ServerType } from '@sasjs/utils'
+import { ServerType } from '@sasjs/utils/types'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
 import { refreshTokensForSasjs } from '../refreshTokensForSasjs'
diff --git a/src/auth/spec/refreshTokensForViya.spec.ts b/src/auth/spec/refreshTokensForViya.spec.ts
index d35a940..09492bd 100644
--- a/src/auth/spec/refreshTokensForViya.spec.ts
+++ b/src/auth/spec/refreshTokensForViya.spec.ts
@@ -1,4 +1,4 @@
-import { AuthConfig, ServerType } from '@sasjs/utils'
+import { AuthConfig, ServerType } from '@sasjs/utils/types'
 import * as NodeFormData from 'form-data'
 import { generateToken, mockAuthResponse } from './mockResponses'
 import { RequestClient } from '../../request/RequestClient'
diff --git a/src/test/RequestClient.spec.ts b/src/test/RequestClient.spec.ts
index fc9cc5d..05bc484 100644
--- a/src/test/RequestClient.spec.ts
+++ b/src/test/RequestClient.spec.ts
@@ -2,7 +2,7 @@ import * as pem from 'pem'
 import * as http from 'http'
 import * as https from 'https'
 import { app, mockedAuthResponse } from './SAS_server_app'
-import { ServerType } from '@sasjs/utils'
+import { ServerType } from '@sasjs/utils/types'
 import SASjs from '../SASjs'
 import * as axiosModules from '../utils/createAxiosInstance'
 import {
diff --git a/src/test/SessionManager.spec.ts b/src/test/SessionManager.spec.ts
index b77c6da..8640fe4 100644
--- a/src/test/SessionManager.spec.ts
+++ b/src/test/SessionManager.spec.ts
@@ -2,7 +2,7 @@ import { SessionManager } from '../SessionManager'
 import { RequestClient } from '../request/RequestClient'
 import * as dotenv from 'dotenv'
 import axios from 'axios'
-import { Logger, LogLevel } from '@sasjs/utils'
+import { Logger, LogLevel } from '@sasjs/utils/logger'
 import { Session, Context } from '../types'
 
 jest.mock('axios')