diff --git a/sasjs-tests/src/testSuites/Basic.ts b/sasjs-tests/src/testSuites/Basic.ts
index a318004c..77174f90 100644
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -53,7 +53,9 @@ export const basicTests = (
         return await newAdapterIns.checkSession()
       },
       assertion: (response: any) =>
-        response?.isLoggedIn && response?.userName === userName
+        adapter.getSasjsConfig().serverType === ServerType.Sas9
+          ? response?.isLoggedIn
+          : response?.isLoggedIn && response?.userName === userName
     },
     {
       title: 'Multiple Log in attempts',
diff --git a/src/auth/AuthManager.ts b/src/auth/AuthManager.ts
index e9b7e15f..68c451fd 100644
--- a/src/auth/AuthManager.ts
+++ b/src/auth/AuthManager.ts
@@ -141,7 +141,7 @@ export class AuthManager {
         await this.performCASSecurityCheck()
       }
 
-      this.loginCallback()
+      await this.loginCallback()
       this.userName = loginParams.username
     }
 
diff --git a/src/job-execution/WebJobExecutor.ts b/src/job-execution/WebJobExecutor.ts
index fe529038..73204583 100644
--- a/src/job-execution/WebJobExecutor.ts
+++ b/src/job-execution/WebJobExecutor.ts
@@ -16,7 +16,8 @@ import { SASViyaApiClient } from '../SASViyaApiClient'
 import {
   isRelativePath,
   parseSasViyaDebugResponse,
-  appendExtraResponseAttributes
+  appendExtraResponseAttributes,
+  getValidJson
 } from '../utils'
 import { BaseJobExecutor } from './JobExecutor'
 import { parseWeboutResponse } from '../utils/parseWeboutResponse'
@@ -183,6 +184,10 @@ export class WebJobExecutor extends BaseJobExecutor {
             }
           }
 
+          if (typeof jsonResponse === 'string') {
+            jsonResponse = getValidJson(jsonResponse)
+          }
+
           const responseObject = appendExtraResponseAttributes(
             { result: jsonResponse, log: res.log },
             extraResponseAttributes