Added suggestions

2025-12-25 23:10:05 +00:00 · 2020-07-16 15:02:40 -04:00 · 2020-07-16 15:02:17 -04:00
118 changed files with 2716 additions and 16987 deletions
--- a/.github/workflows/npmpublish.yml
+++ b/.github/workflows/npmpublish.yml
@@ -6,7 +6,7 @@ name: SASjs Build and Publish
 on:
  push:
    branches:
-      - master
+      - main

 jobs:
  build:
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ Tests are run using cypress. Before running tests, you need to define the follow

 ```

-filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas?_=1";
 %inc mc;
 filename ft15f001 temp;
 parmcards4;
@@ -40,13 +40,18 @@ parmcards4;
 # Viya

 ```
-filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+filename mc url "https://raw.githubusercontent.com/macropeople/macrocore/main/mc_all.sas";
 %inc mc;
+
 filename ft15f001 temp;
 parmcards4;
-  %webout(FETCH)
  %webout(OPEN)
+  %global sasjs_tables;
+  %let sasjs_tables=&sasjs_tables;
+  %put &=sasjs_tables;
+  %let sasjs_tables=&sasjs_tables;
  %macro x();
+  %global sasjs_tables;
  %do i=1 %to %sysfunc(countw(&sasjs_tables));
    %let table=%scan(&sasjs_tables,&i);
    %webout(OBJ,&table)
@@ -55,11 +60,13 @@ parmcards4;
  %x()
  %webout(CLOSE)
 ;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendObj)
+%mv_createwebservice(path=/Public/app/common,name=sendObj)
 filename ft15f001 temp;
 parmcards4;
-  %webout(FETCH)
  %webout(OPEN)
+  %global sasjs_tables;
+  %let sasjs_tables=&sasjs_tables;
+  %put &=sasjs_tables;
  %macro x();
  %do i=1 %to %sysfunc(countw(&sasjs_tables));
    %let table=%scan(&sasjs_tables,&i);
@@ -69,7 +76,7 @@ parmcards4;
  %x()
  %webout(CLOSE)
 ;;;;
-%mp_createwebservice(path=/Public/app/common,name=sendArr)
+%mv_createwebservice(path=/Public/app/common,name=sendArr)
 ```

 The above services will return anything you send. To run the tests simply launch `npm run cypress`.
--- a/README.md
+++ b/README.md
@@ -10,13 +10,13 @@ SASjs is a open-source framework for building Web Apps on SAS® platforms. You c

 3 - Reference directly from the CDN - in which case click [here](https://www.jsdelivr.com/package/npm/@sasjs/adapter?tab=collection) and select "SRI" to get the script tag with the integrity hash.

-If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/sasjs/react-seed-app) which provides some boilerplate.
+If you are short on time and just need to build an app quickly, then check out [this video](https://vimeo.com/393161794) and the [react-seed-app](https://github.com/macropeople/react-seed-app) which provides some boilerplate.

 For more information on building web apps with SAS, check out [sasjs.io](https://sasjs.io)

 ## None of this makes sense. How do I build an app with it?

-Ok ok. Deploy this [example.html](https://raw.githubusercontent.com/sasjs/adapter/master/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.
+Ok ok. Deploy this [example.html](https://github.com/sasjs/adapter/blob/main/example.html) file to your web server, and update `servertype` to `SAS9` or `SASVIYA` depending on your backend.

 The backend part can be deployed as follows:

@@ -43,6 +43,6 @@ You now have a simple web app with a backend service!

 # More resources

-For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.
+For more information specific to this adapter you can check out this [user guide](https://sasjs.io/sasjs/sasjs-adapter/) or the [technical](http://adapter.sasjs.io/) documentation.

 For more information on building web apps in general, check out these [resources](https://sasjs.io/training/resources/) or contact the [author](https://www.linkedin.com/in/allanbowe/) directly.
--- a/docs/assets/js/search.json
+++ b/docs/assets/js/search.json
--- a/docs/classes/reflection-560.reflection-1.sas9apiclient.html
+++ b/docs/classes/reflection-560.reflection-1.sas9apiclient.html
--- a/docs/classes/reflection-560.reflection-1.sasjs.html
+++ b/docs/classes/reflection-560.reflection-1.sasjs.html
--- a/docs/classes/reflection-560.reflection-1.sasviyaapiclient.html
+++ b/docs/classes/reflection-560.reflection-1.sasviyaapiclient.html
--- a/docs/classes/reflection-560.reflection-1.sessionmanager.html
+++ b/docs/classes/reflection-560.reflection-1.sessionmanager.html
--- a/docs/classes/reflection-588.reflection-1.sas9apiclient.html
+++ b/docs/classes/reflection-588.reflection-1.sas9apiclient.html
--- a/docs/classes/reflection-588.reflection-1.sasjs.html
+++ b/docs/classes/reflection-588.reflection-1.sasjs.html
--- a/docs/classes/reflection-588.reflection-1.sasviyaapiclient.html
+++ b/docs/classes/reflection-588.reflection-1.sasviyaapiclient.html
--- a/docs/classes/reflection-588.reflection-1.sessionmanager.html
+++ b/docs/classes/reflection-588.reflection-1.sessionmanager.html
--- a/docs/classes/reflection-607.reflection-145.fileuploader.html
+++ b/docs/classes/reflection-607.reflection-145.fileuploader.html
--- a/docs/classes/reflection-607.reflection-145.sas9apiclient.html
+++ b/docs/classes/reflection-607.reflection-145.sas9apiclient.html
--- a/docs/classes/reflection-607.reflection-145.sasjs.html
+++ b/docs/classes/reflection-607.reflection-145.sasjs.html
--- a/docs/classes/reflection-607.reflection-145.sasviyaapiclient.html
+++ b/docs/classes/reflection-607.reflection-145.sasviyaapiclient.html
--- a/docs/classes/reflection-607.reflection-145.sessionmanager.html
+++ b/docs/classes/reflection-607.reflection-145.sessionmanager.html
--- a/docs/classes/reflection-610.reflection-149.fileuploader.html
+++ b/docs/classes/reflection-610.reflection-149.fileuploader.html
--- a/docs/classes/reflection-610.reflection-149.sas9apiclient.html
+++ b/docs/classes/reflection-610.reflection-149.sas9apiclient.html
--- a/docs/classes/reflection-610.reflection-149.sasjs.html
+++ b/docs/classes/reflection-610.reflection-149.sasjs.html
--- a/docs/classes/reflection-610.reflection-149.sasviyaapiclient.html
+++ b/docs/classes/reflection-610.reflection-149.sasviyaapiclient.html
--- a/docs/classes/reflection-610.reflection-149.sessionmanager.html
+++ b/docs/classes/reflection-610.reflection-149.sessionmanager.html
--- a/docs/classes/reflection-611.reflection-149.fileuploader.html
+++ b/docs/classes/reflection-611.reflection-149.fileuploader.html
--- a/docs/classes/reflection-611.reflection-149.sas9apiclient.html
+++ b/docs/classes/reflection-611.reflection-149.sas9apiclient.html
--- a/docs/classes/reflection-611.reflection-149.sasjs.html
+++ b/docs/classes/reflection-611.reflection-149.sasjs.html
--- a/docs/classes/reflection-611.reflection-149.sasviyaapiclient.html
+++ b/docs/classes/reflection-611.reflection-149.sasviyaapiclient.html
--- a/docs/classes/reflection-611.reflection-149.sessionmanager.html
+++ b/docs/classes/reflection-611.reflection-149.sessionmanager.html
--- a/docs/classes/types.sasjsconfig.html
+++ b/docs/classes/types.sasjsconfig.html
--- a/docs/enums/types.servertype.html
+++ b/docs/enums/types.servertype.html
--- a/docs/globals.html
+++ b/docs/globals.html
--- a/docs/index.html
+++ b/docs/index.html
--- a/docs/interfaces/types.context.html
+++ b/docs/interfaces/types.context.html
--- a/docs/interfaces/types.csrftoken.html
+++ b/docs/interfaces/types.csrftoken.html
--- a/docs/interfaces/types.folder.html
+++ b/docs/interfaces/types.folder.html
--- a/docs/interfaces/types.job.html
+++ b/docs/interfaces/types.job.html
--- a/docs/interfaces/types.jobdefinition.html
+++ b/docs/interfaces/types.jobdefinition.html
--- a/docs/interfaces/types.jobresult.html
+++ b/docs/interfaces/types.jobresult.html
--- a/docs/interfaces/types.link.html
+++ b/docs/interfaces/types.link.html
--- a/docs/interfaces/types.sasjsrequest.html
+++ b/docs/interfaces/types.sasjsrequest.html
--- a/docs/interfaces/types.sasjswaitingrequest.html
+++ b/docs/interfaces/types.sasjswaitingrequest.html
--- a/docs/interfaces/types.session.html
+++ b/docs/interfaces/types.session.html
--- a/docs/interfaces/types.uploadfile.html
+++ b/docs/interfaces/types.uploadfile.html
--- a/docs/modules/reflection-560.html
+++ b/docs/modules/reflection-560.html
--- a/docs/modules/reflection-560.reflection-1.html
+++ b/docs/modules/reflection-560.reflection-1.html
--- a/docs/modules/reflection-588.html
+++ b/docs/modules/reflection-588.html
--- a/docs/modules/reflection-588.reflection-1.html
+++ b/docs/modules/reflection-588.reflection-1.html
--- a/docs/modules/reflection-607.html
+++ b/docs/modules/reflection-607.html
--- a/docs/modules/reflection-607.reflection-145.html
+++ b/docs/modules/reflection-607.reflection-145.html
--- a/docs/modules/reflection-610.html
+++ b/docs/modules/reflection-610.html
--- a/docs/modules/reflection-610.reflection-149.html
+++ b/docs/modules/reflection-610.reflection-149.html
--- a/docs/modules/reflection-611.html
+++ b/docs/modules/reflection-611.html
--- a/docs/modules/reflection-611.reflection-149.html
+++ b/docs/modules/reflection-611.reflection-149.html
--- a/docs/modules/types.html
+++ b/docs/modules/types.html
--- a/docs/modules/utils.html
+++ b/docs/modules/utils.html
--- a/example.html
+++ b/example.html
@@ -1,109 +1,114 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <script src="https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1.0.6"></script> 
-    <script>
-      var sasJs = new SASjs.default({
-         appLoc: "/Public/app/readme"
-        ,serverType:"SAS9"
-        ,debug: false
-      });
-      function initSasJs() {
-        $('#loading-spinner').show()
-        // instantiate sasjs with options such as backend app location
-        // login (it's also possible to set an autologin when making requests)
-        sasJs.logIn(
-           $('#username')[0].value
-          ,$('#password')[0].value
-        ).then((response) => {
-          if (response.isLoggedIn === true) {
-            $('#loading-spinner').hide()
-            $('.login').hide()
-            $('#getdata').show()
-            $('#cars').show()
-          }
-        })
-      }
-      function getData(){
-        $('#loading-spinner').show()
-        $('#myChart').remove();
-        $('#chart-container').append('<canvas id="myChart" style="display: none;"></canvas>')
-        // make a request to a SAS service
-        var type = $("#cars")[0].options[$("#cars")[0].selectedIndex].value;
-        // request data from an endpoint under your appLoc
-        sasJs.request("/common/getdata", {
-            // send data as an array of objects - each object is one row
-            fromjs: [{ type: type }] 
-        }).then((response) => {
-          $('#myChart').show();
-          var labels = []
-          var data = []
-          response.areas.map((d) => {
-            labels.push(d.MAKE);
-            data.push(d.AVPRICE);
-          })
-          $('#loading-spinner').hide()
-          initGraph(labels, data, type);
-        })
-      }
-      function initGraph(labels, data, type){
-        var myCanvas = document.getElementById("myChart");
-        var ctx = myCanvas.getContext("2d");
-        var myChart = new Chart(ctx, {
-            type: 'bar',
-            data: {
-                labels: labels,
-                datasets: [{
-                    label: "Average Invoice Price in USD for " + type + " Cars by Manufacturer",
-                    data: data,
-                    backgroundColor: "rgba(255,99,132,0.2)",
-                    borderColor: "rgba(255,99,132,1)",
-                    borderWidth: 1,
-                    hoverBackgroundColor: "rgba(255,99,132,0.4)",
-                    hoverBorderColor: "rgba(255,99,132,1)",
-                }]
-            },
-            options: {
-                maintainAspectRatio: false,
-                scales: {yAxes: [{ticks: {beginAtZero: true}}]}
+    <head>
+        <meta charset='utf-8' http-equiv='X-UA-Compatible' content='IE=edge' />
+        <link rel='stylesheet' href='https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css' integrity='sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh' crossorigin='anonymous'>
+        <script src='https://cdn.jsdelivr.net/combine/npm/chart.js@2.9.3,npm/jquery@3.5.1,npm/@sasjs/adapter@1'></script>
+        <script>
+            const sasJs = new SASjs.default({
+                appLoc: '/Products/demo/readme',
+                serverType:'SAS9',
+                debug: 'false'
+            })
+
+            const initSasJs = () => {
+                $('#loading-spinner').show()
+
+                // instantiate sasJs with options such as backend app location
+                // login (it's also possible to set an auto login when making requests)
+                sasJs.logIn($('#username')[0].value, $('#password')[0].value)
+                    .then((response) => {
+                        if (response.isLoggedIn === true) {
+                            $('#loading-spinner').hide()
+                            $('.login').hide()
+                            $('#getDataBtn').show()
+                            $('#cars').show()
+                        }
+                })
            }
-        });
-      }
-    </script>
-    <meta charset="utf-8" http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
-  </head>
-  <body>
-    <div class="container-fluid" style="text-align: center; margin-top: 10px;">
-      <div class="row">
-          <div class="col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto">
-          <h1>Demo Seed App for <span class="code">SASjs</span></h1>
-          <div class="login" id="login-form">
-            <div class="form-group">
-              <input class="form-control" type="text" id="username" placeholder="Enter username" />
+
+            // make a request to a SAS service
+            const getData = () => {
+                $('#loading-spinner').show()
+                $('#myChart').remove()
+                $('#chart-container').append("<canvas id='myChart' style='display: none'></canvas>")
+
+                const type = $('#cars')[0].options[$('#cars')[0].selectedIndex].value
+
+                // request data from an endpoint under your appLoc
+                // send data as an array of objects - each object is one row
+                sasJs.request('/common/getdata', {fromjs: [{ type: type }]})
+                    .then((response) => {
+                        $('#myChart').show()
+                        $('#loading-spinner').hide()
+
+                        const labels = response.areas.map(area => area.MAKE)
+                        const data = response.areas.map(area => area.AVPRICE)
+
+                        initGraph(labels, data, type)
+                    })
+            }
+
+            const initGraph = (labels, data, type) => {
+                const myCanvas = document.getElementById('myChart')
+                const ctx = myCanvas.getContext('2d')
+
+                const myChart = new Chart(ctx, {
+                    type: 'bar',
+                    data: {
+                        labels: labels,
+                        datasets: [{
+                            label: `Average Invoice Price in USD for ${type} Cars by Manufacturer`,
+                            data: data,
+                            backgroundColor: 'rgba(255,99,132,0.2)',
+                            borderColor: 'rgba(255,99,132,1)',
+                            borderWidth: 1,
+                            hoverBackgroundColor: 'rgba(255,99,132,0.4)',
+                            hoverBorderColor: 'rgba(255,99,132,1)',
+                        }]
+                    },
+                    options: {
+                        maintainAspectRatio: false,
+                        scales: {yAxes: [{ticks: {beginAtZero: true}}]}
+                    }
+                })
+            }
+        </script>
+    </head>
+    <body>
+        <div class='container-fluid' style='text-align: center; margin-top: 10px'>
+            <div class='row'>
+                <div class='col-lg-5 col-md-7 col-sm-10 mx-auto mx-auto'>
+                    <h1>Demo Seed App for <span class='code'>SASjs</span></h1>
+                    <div class='login' id='login-form'>
+                        <div class='form-group'>
+                            <input class='form-control' type='text' id='username' placeholder='Enter username' />
+                        </div>
+                        <div class='form-group'>
+                            <input class='form-control' type='password' id='password' placeholder='Enter password' />
+                        </div>
+                        <button id='login' onclick='initSasJs()' class='login btn btn-primary' style='margin-bottom: 5px'>Log In</button>
+                    </div>
+                    <select name='cars' id='cars' style='margin-bottom: 5px; display: none' class='form-control'>
+                        <option value='Hybrid'>Hybrid</option>
+                        <option value='SUV'>SUV</option>
+                        <option value='Sedan'>Sedan</option>
+                        <option value='Sports'>Sports</option>
+                        <option value='Truck'>Truck</option>
+                        <option value='Wagon'>Wagon</option>
+                    </select>
+                    <button id='getDataBtn' onclick='getData()' style='margin-bottom: 5px; display: none' class='btn btn-success'>Get Data</button>
+                    <br>
+                    <br>
+                    <div id='loading-spinner' class='spinner-border text-primary' role='status' style='display: none'>
+                        <span class='sr-only'>Loading...</span>
+                    </div>
+                    <br>
+                </div>
            </div>
-            <div class="form-group">
-              <input class="form-control" type="password" id="password" placeholder="Enter password" />
-            </div>
-            <button id="login" onclick="initSasJs()" class="login btn btn-primary" style="margin-bottom: 5px;">Log In</button>
-          </div>
-          <select name="cars" id="cars" style="margin-bottom: 5px; display: none;" class="form-control">
-            <option value="Hybrid">Hybrid</option>
-            <option value="SUV">SUV</option>
-            <option value="Sedan">Sedan</option>
-            <option value="Sports">Sports</option>
-            <option value="Truck">Truck</option>
-            <option value="Wagon">Wagon</option>
-          </select>
-          <button id="getdata" onclick="getData()" style="margin-bottom: 5px; display: none;" class="btn btn-success">Get Data</button><br><br>
-          <div id="loading-spinner" class="spinner-border text-primary" role="status" style="display: none;">
-            <span class="sr-only">Loading...</span>
-          </div><br>
        </div>
-      </div>
-    </div>
-    <div id="chart-container" style="height: 65vh; width: 100%; position: relative; margin: auto;">
-      <canvas id="myChart" style="display: none;"></canvas>
-    </div>
-  </body>
+        <div id='chart-container' style='height: 65vh; width: 100%; position: relative; margin: auto'>
+            <canvas id='myChart' style='display: none'></canvas>
+        </div>
+    </body>
 </head>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -22,6 +22,9 @@
      {
        "pkgRoot": "/build"
      }
+    ],
+    "branches": [
+      "main"
    ]
  },
  "keywords": [
@@ -37,7 +40,7 @@
  "license": "ISC",
  "devDependencies": {
    "@types/isomorphic-fetch": "0.0.35",
-    "@types/jest": "^26.0.9",
+    "@types/jest": "^26.0.4",
    "cp": "^0.2.0",
    "jest": "^25.5.4",
    "path": "^0.12.7",
@@ -45,15 +48,15 @@
    "rimraf": "^3.0.2",
    "semantic-release": "^17.1.1",
    "ts-jest": "^25.5.1",
-    "ts-loader": "^8.0.2",
-    "tslint": "^6.1.3",
+    "ts-loader": "^7.0.5",
+    "tslint": "^6.1.2",
    "tslint-config-prettier": "^1.18.0",
    "typedoc": "^0.17.8",
    "typedoc-neo-theme": "^1.0.9",
    "typedoc-plugin-external-module-name": "^4.0.3",
-    "typescript": "^3.9.7",
+    "typescript": "^3.9.6",
    "uglifyjs-webpack-plugin": "^2.2.0",
-    "webpack": "^4.44.1",
+    "webpack": "^4.43.0",
    "webpack-cli": "^3.3.12"
  },
  "main": "index.js",
--- a/sasjs-tests/package-lock.json
+++ b/sasjs-tests/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "@sasjs/tests",
-  "version": "1.0.0",
+  "name": "sasjs-tests",
+  "version": "0.1.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1356,81 +1356,11 @@
      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
      "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="
    },
-    "@sasjs/adapter": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-1.2.0.tgz",
-      "integrity": "sha512-PcQcmb7TsfPJ94tzFnvycm+tMYD3wKx2a6niwHfsV9+g6XHtmwReVV3EPZZ5XB4s565vU6Qc+ZnFbMIAeik8QA==",
-      "requires": {
-        "es6-promise": "^4.2.8",
-        "form-data": "^3.0.0",
-        "isomorphic-fetch": "^2.2.1"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
-          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
-    "@sasjs/test-framework": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@sasjs/test-framework/-/test-framework-1.3.3.tgz",
-      "integrity": "sha512-Ou4UXlxBAVR8jv7boVvJ/eKLHRTQvDi9LouPAasLCO2EC4AD0wX1hLMwVhmydCvsdgVEeXs6InvX3ROHiKSADg==",
-      "requires": {
-        "@types/react-highlight.js": "^1.0.0",
-        "immer": "^7.0.7",
-        "moment": "^2.27.0",
-        "react-highlight.js": "^1.0.7",
-        "semantic-ui-css": "^2.4.1",
-        "semantic-ui-react": "^1.0.0"
-      },
-      "dependencies": {
-        "immer": {
-          "version": "7.0.7",
-          "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.7.tgz",
-          "integrity": "sha512-Q8yYwVADJXrNfp1ZUAh4XDHkcoE3wpdpb4mC5abDSajs2EbW8+cGdPyAnglMyLnm7EF6ojD2xBFX7L5i4TIytw=="
-        }
-      }
-    },
-    "@semantic-ui-react/event-stack": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@semantic-ui-react/event-stack/-/event-stack-3.1.1.tgz",
-      "integrity": "sha512-SA7VOu/tY3OkooR++mm9voeQrJpYXjJaMHO1aFCcSouS2xhqMR9Gnz0LEGLOR0h9ueWPBKaQzKIrx3FTTJZmUQ==",
-      "requires": {
-        "exenv": "^1.2.2",
-        "prop-types": "^15.6.2"
-      }
-    },
    "@sheerun/mutationobserver-shim": {
      "version": "0.3.3",
      "resolved": "https://registry.npmjs.org/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz",
      "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw=="
    },
-    "@stardust-ui/react-component-event-listener": {
-      "version": "0.38.0",
-      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-event-listener/-/react-component-event-listener-0.38.0.tgz",
-      "integrity": "sha512-sIP/e0dyOrrlb8K7KWumfMxj/gAifswTBC4o68Aa+C/GA73ccRp/6W1VlHvF/dlOR4KLsA+5SKnhjH36xzPsWg==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "prop-types": "^15.7.2"
-      }
-    },
-    "@stardust-ui/react-component-ref": {
-      "version": "0.38.0",
-      "resolved": "https://registry.npmjs.org/@stardust-ui/react-component-ref/-/react-component-ref-0.38.0.tgz",
-      "integrity": "sha512-xjs6WnvJVueSIXMWw0C3oWIgAPpcD03qw43oGOjUXqFktvpNkB73JoKIhS4sCrtQxBdct75qqr4ZL6JiyPcESw==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.6.3"
-      }
-    },
    "@svgr/babel-plugin-add-jsx-attribute": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
@@ -1906,14 +1836,6 @@
        "@types/react": "*"
      }
    },
-    "@types/react-highlight.js": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/react-highlight.js/-/react-highlight.js-1.0.0.tgz",
-      "integrity": "sha512-5VXEuo2O9L66y/2GDQSGFTggQkpOvDc/p2ma1KHadu7o/H720HK3Fr83epd4wtQky7B/RoCPat0SKyhlhiUo7A==",
-      "requires": {
-        "@types/react": "*"
-      }
-    },
    "@types/react-router": {
      "version": "5.1.8",
      "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.8.tgz",
@@ -3832,11 +3754,6 @@
        "shallow-clone": "^0.1.2"
      }
    },
-    "clsx": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
-      "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
-    },
    "co": {
      "version": "4.6.0",
      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -4178,15 +4095,6 @@
        "sha.js": "^2.4.8"
      }
    },
-    "create-react-context": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz",
-      "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
-      "requires": {
-        "gud": "^1.0.0",
-        "warning": "^4.0.3"
-      }
-    },
    "cross-spawn": {
      "version": "6.0.5",
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -5004,21 +4912,11 @@
      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
    },
    "encoding": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
      "requires": {
-        "iconv-lite": "^0.6.2"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3.0.0"
-          }
-        }
+        "iconv-lite": "~0.4.13"
      }
    },
    "end-of-stream": {
@@ -5711,11 +5609,6 @@
        "strip-eof": "^1.0.0"
      }
    },
-    "exenv": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
-      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
-    },
    "exit": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -6585,11 +6478,6 @@
      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
    },
-    "gud": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz",
-      "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
-    },
    "gzip-size": {
      "version": "5.1.1",
      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
@@ -6734,11 +6622,6 @@
      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
    },
-    "highlight.js": {
-      "version": "9.18.3",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.3.tgz",
-      "integrity": "sha512-zBZAmhSupHIl5sITeMqIJnYCDfAEc3Gdkqj65wC1lpI468MMQeeQkhcIAvk+RylAkxrCcI9xy9piHiXeQ1BdzQ=="
-    },
    "history": {
      "version": "4.10.1",
      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
@@ -8091,11 +7974,6 @@
        }
      }
    },
-    "jquery": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
-    },
    "js-base64": {
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz",
@@ -8245,11 +8123,6 @@
        "object.assign": "^4.1.0"
      }
    },
-    "keyboard-key": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/keyboard-key/-/keyboard-key-1.1.0.tgz",
-      "integrity": "sha512-qkBzPTi3rlAKvX7k0/ub44sqOfXeLc/jcnGGmj5c7BJpU8eDrEVPyhCvNYAaoubbsLm9uGWwQJO1ytQK1a9/dQ=="
-    },
    "killable": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -9014,11 +8887,6 @@
        "minimist": "^1.2.5"
      }
    },
-    "moment": {
-      "version": "2.27.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
-    },
    "move-concurrently": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
@@ -10012,11 +9880,6 @@
        "ts-pnp": "^1.1.6"
      }
    },
-    "popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="
-    },
    "portfinder": {
      "version": "1.0.26",
      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
@@ -11458,34 +11321,11 @@
      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
      "integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA=="
    },
-    "react-highlight.js": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/react-highlight.js/-/react-highlight.js-1.0.7.tgz",
-      "integrity": "sha512-OVPKnV0ZvU+V//HExwbV8M9CWy49Eo/9y9pBN2OsNWUFPN6dE4YZBLmJW/5sM2DxI5v/QQLyxOnTnSSfGCP+9Q==",
-      "requires": {
-        "highlight.js": "^9.3.0",
-        "prop-types": "^15.6.0"
-      }
-    },
    "react-is": {
      "version": "16.13.1",
      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
    },
-    "react-popper": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.7.tgz",
-      "integrity": "sha512-nmqYTx7QVjCm3WUZLeuOomna138R1luC4EqkW3hxJUrAe+3eNz3oFCLYdnPwILfn0mX1Ew2c3wctrjlUMYYUww==",
-      "requires": {
-        "@babel/runtime": "^7.1.2",
-        "create-react-context": "^0.3.0",
-        "deep-equal": "^1.1.1",
-        "popper.js": "^1.14.4",
-        "prop-types": "^15.6.1",
-        "typed-styles": "^0.0.7",
-        "warning": "^4.0.2"
-      }
-    },
    "react-router": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
@@ -12110,6 +11950,27 @@
      "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-10.0.0.tgz",
      "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg=="
    },
+    "sasjs": {
+      "version": "file:../build/sasjs-5.0.0.tgz",
+      "integrity": "sha512-8Ez2iS8BKzu2GG1Cwf/pe5PgNvdhowFodQNCTHIxMlDYgLqmg1mcpwRjJjnXF9A73gX0NkR65olYYAesp8cMMA==",
+      "requires": {
+        "es6-promise": "^4.2.8",
+        "form-data": "^3.0.0",
+        "isomorphic-fetch": "^2.2.1"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.0.tgz",
+          "integrity": "sha512-CKMFDglpbMi6PyN+brwB9Q/GOw0eAnsrEZDgcsH5Krhz5Od/haKHAX0NmQfha2zPPz0JpWzA7GJHGSnvCRLWsg==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        }
+      }
+    },
    "sass-graph": {
      "version": "2.2.5",
      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz",
@@ -12225,47 +12086,6 @@
        "node-forge": "0.9.0"
      }
    },
-    "semantic-ui-css": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/semantic-ui-css/-/semantic-ui-css-2.4.1.tgz",
-      "integrity": "sha512-Pkp0p9oWOxlH0kODx7qFpIRYpK1T4WJOO4lNnpNPOoWKCrYsfHqYSKgk5fHfQtnWnsAKy7nLJMW02bgDWWFZFg==",
-      "requires": {
-        "jquery": "x.*"
-      }
-    },
-    "semantic-ui-react": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/semantic-ui-react/-/semantic-ui-react-1.1.1.tgz",
-      "integrity": "sha512-QtzLNkK4MUe1HQo4S7/tIkSp4NFtxSGDzTMKxmvztMJ6jt+nKGmMyjpyxJsrm3ohU8Z3sTyBUyiBsDYW4jNtjw==",
-      "requires": {
-        "@babel/runtime": "^7.10.5",
-        "@semantic-ui-react/event-stack": "^3.1.0",
-        "@stardust-ui/react-component-event-listener": "~0.38.0",
-        "@stardust-ui/react-component-ref": "~0.38.0",
-        "clsx": "^1.1.1",
-        "keyboard-key": "^1.1.0",
-        "lodash": "^4.17.19",
-        "prop-types": "^15.7.2",
-        "react-is": "^16.8.6",
-        "react-popper": "^1.3.7",
-        "shallowequal": "^1.1.0"
-      },
-      "dependencies": {
-        "@babel/runtime": {
-          "version": "7.11.2",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-          "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
-          "requires": {
-            "regenerator-runtime": "^0.13.4"
-          }
-        },
-        "lodash": {
-          "version": "4.17.19",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
-          "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
-        }
-      }
-    },
    "semver": {
      "version": "6.3.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -12455,11 +12275,6 @@
        }
      }
    },
-    "shallowequal": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
-      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
-    },
    "shebang-command": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -13628,11 +13443,6 @@
        "mime-types": "~2.1.24"
      }
    },
-    "typed-styles": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz",
-      "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q=="
-    },
    "typedarray": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -13934,14 +13744,6 @@
        "makeerror": "1.0.x"
      }
    },
-    "warning": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
    "watchpack": {
      "version": "1.7.2",
      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
--- a/sasjs-tests/package.json
+++ b/sasjs-tests/package.json
@@ -1,11 +1,9 @@
 {
-  "name": "@sasjs/tests",
-  "version": "1.0.0",
+  "name": "sasjs-tests",
+  "version": "0.1.0",
  "homepage": ".",
  "private": true,
  "dependencies": {
-    "@sasjs/adapter": "^1.2.0",
-    "@sasjs/test-framework": "^1.3.3",
    "@testing-library/jest-dom": "^4.2.4",
    "@testing-library/react": "^9.5.0",
    "@testing-library/user-event": "^7.2.1",
@@ -18,6 +16,7 @@
    "react-dom": "^16.13.1",
    "react-router-dom": "^5.2.0",
    "react-scripts": "3.4.1",
+    "sasjs": "file:../build/sasjs-5.0.0.tgz",
    "typescript": "^3.9.6"
  },
  "scripts": {
@@ -25,7 +24,7 @@
    "build": "react-scripts build",
    "test": "react-scripts test",
    "eject": "react-scripts eject",
-    "deploy": "cd .. && npm run package:lib && cd sasjs-tests && npm i ../build/sasjs-adapter-5.0.0.tgz && npm run build && rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
+    "deploy": "rsync -avhe ssh ./build/* --delete kriaco@sas.analytium.co.uk:/var/www/html/kriaco/sasjs-tests"
  },
  "eslintConfig": {
    "extends": "react-app"
@@ -45,4 +44,4 @@
  "devDependencies": {
    "node-sass": "^4.14.1"
  }
-}
+}
--- a/sasjs-tests/public/config.json
+++ b/sasjs-tests/public/config.json
@@ -6,7 +6,6 @@
    "appLoc": "/Public/app",
    "serverType": "SASVIYA",
    "debug": false,
-    "contextName": "SharedCompute",
-    "useComputeApi": true
+    "contextName": null
  }
 }
--- a/sasjs-tests/src/App.scss
+++ b/sasjs-tests/src/App.scss
@@ -0,0 +1,102 @@
+.app {
+  padding: 16px;
+
+  .controls {
+    display: flex;
+    align-items: center;
+    .debug-toggle,
+    .app-loc-input,
+    .submit-button {
+      margin: 16px 0;
+    }
+
+    .row {
+      margin: 16px;
+
+      &.app-loc {
+        width: 20vw;
+      }
+    }
+
+    .submit-button {
+      padding: 16px;
+      font-size: 1.25em;
+    }
+
+    .app-loc-input {
+      width: 100%;
+    }
+  }
+
+  .debug-toggle {
+    display: inline-flex;
+    justify-content: center;
+    align-items: center;
+
+    .label {
+      padding: 0 8px;
+      font-size: 1.25em;
+    }
+  }
+
+  $height: 40px;
+  $width: 70px;
+  .switch {
+    position: relative;
+    display: inline-flex;
+    width: $width;
+    height: $height;
+
+    input[type="checkbox"] {
+      display: none;
+    }
+    input:checked + .knob {
+      animation: colorChange 0.4s linear forwards;
+    }
+    input:checked + .knob:before {
+      animation: turnON 0.4s linear forwards;
+    }
+  }
+
+  @keyframes colorChange {
+    from {
+      background-color: #ccc;
+    }
+    50% {
+      background-color: #a4d9ad;
+    }
+    to {
+      background-color: #4bd663;
+    }
+  }
+  @keyframes turnON {
+    from {
+      transform: translateX(0px);
+    }
+    to {
+      transform: translateX($width - ($height * 0.99));
+      box-shadow: -10px 0px 44px 0px #434343;
+    }
+  }
+
+  .knob {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    border-radius: $height;
+  }
+
+  .knob:before {
+    position: absolute;
+    background-color: white;
+    content: "";
+    left: $height * 0.1;
+    top: $height * 0.1;
+    width: ($height * 0.8);
+    height: ($height * 0.8);
+    border-radius: 50%;
+  }
+}
--- a/sasjs-tests/src/App.test.js
+++ b/sasjs-tests/src/App.test.js
@@ -5,5 +5,6 @@ import App from './App';
 test('renders learn react link', () => {
  const { getByText } = render(<App />);
  const linkElement = getByText(/learn react/i);
+
  expect(linkElement).toBeInTheDocument();
 });
--- a/sasjs-tests/src/App.tsx
+++ b/sasjs-tests/src/App.tsx
@@ -1,30 +1,54 @@
 import React, { ReactElement, useState, useContext, useEffect } from "react";
-import { TestSuiteRunner, TestSuite, AppContext } from "@sasjs/test-framework";
-import { basicTests } from "./testSuites/Basic";
-import { sendArrTests, sendObjTests } from "./testSuites/RequestData";
-import { specialCaseTests } from "./testSuites/SpecialCases";
-import { sasjsRequestTests } from "./testSuites/SasjsRequests";
-import "@sasjs/test-framework/dist/index.css";
+import "./App.scss";
+import TestSuiteRunner from "./TestSuiteRunner";
+import { AppContext } from "./context/AppContext";

 const App = (): ReactElement<{}> => {
-  const { adapter, config } = useContext(AppContext);
-  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
+  const [appLoc, setAppLoc] = useState("");
+  const [debug, setDebug] = useState(false);
+  const { adapter } = useContext(AppContext);

  useEffect(() => {
-    if (adapter) {
-      setTestSuites([
-        basicTests(adapter, config.userName, config.password),
-        sendArrTests(adapter),
-        sendObjTests(adapter),
-        specialCaseTests(adapter),
-        sasjsRequestTests(adapter),
-      ]);
+    if (adapter) adapter.setDebugState(debug);
+  }, [debug, adapter]);
+
+  useEffect(() => {
+    if (appLoc && adapter) {
+      adapter.setSASjsConfig({ ...adapter.getSasjsConfig(), appLoc });
    }
-  }, [adapter, config]);
+  }, [appLoc, adapter]);
+
+  useEffect(() => {
+    setAppLoc(adapter.getSasjsConfig().appLoc);
+  }, [adapter]);

  return (
    <div className="app">
-      {adapter && testSuites && <TestSuiteRunner testSuites={testSuites} />}
+      <div className="controls">
+        <div className="row">
+          <label>Debug</label>
+          <div className="debug-toggle">
+            <label className="switch">
+              <input
+                type="checkbox"
+                onChange={(e) => setDebug(e.target.checked)} // FIXME: rename 'e' => 'event'
+              />
+              <span className="knob"></span>
+            </label>
+          </div>
+        </div>
+        <div className="row app-loc">
+          <label>App Loc</label>
+          <input
+            type="text"
+            className="app-loc-input"
+            value={appLoc}
+            onChange={(e) => setAppLoc(e.target.value)} // FIXME: rename 'e' => 'event'
+            placeholder="AppLoc"
+          />
+        </div>
+      </div>
+      {adapter && <TestSuiteRunner adapter={adapter} />}
    </div>
  );
 };
--- a/sasjs-tests/src/Login.tsx
+++ b/sasjs-tests/src/Login.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement, useState, useCallback, useContext } from "react";
 import "./Login.scss";
-import { AppContext } from "@sasjs/test-framework";
+import { AppContext } from "./context/AppContext";
 import { Redirect } from "react-router-dom";

 const Login = (): ReactElement<{}> => {
@@ -9,11 +9,14 @@ const Login = (): ReactElement<{}> => {
  const appContext = useContext(AppContext);

  const handleSubmit = useCallback(
-    (e) => {
+    (e) => { // FIXME: rename 'e' => 'event'
      e.preventDefault();
-      appContext.adapter.logIn(username, password).then((res) => {
-        appContext.setIsLoggedIn(res.isLoggedIn);
-      });
+
+      appContext.adapter.logIn(username, password)
+        .then(() => {
+            appContext.setIsLoggedIn(true);
+        });
+        // FIXME: catch block
    },
    [username, password, appContext]
  );
@@ -38,7 +41,7 @@ const Login = (): ReactElement<{}> => {
            type="password"
            value={password}
            required
-            onChange={(e) => setPassword(e.target.value)}
+            onChange={(e) => setPassword(e.target.value)} // FIXME: rename 'e' => 'event'
          />
        </div>
        <button type="submit" className="submit-button">
@@ -51,4 +54,4 @@ const Login = (): ReactElement<{}> => {
  );
 };

-export default Login;
+export default Login;
--- a/sasjs-tests/src/PrivateRoute.tsx
+++ b/sasjs-tests/src/PrivateRoute.tsx
@@ -1,6 +1,6 @@
 import React, { ReactElement, useContext, FunctionComponent } from "react";
 import { Redirect, Route } from "react-router-dom";
-import { AppContext } from "@sasjs/test-framework";
+import { AppContext } from "./context/AppContext";

 interface PrivateRouteProps {
  component: FunctionComponent;
@@ -8,16 +8,14 @@ interface PrivateRouteProps {
  path: string;
 }

-const PrivateRoute = (
-  props: PrivateRouteProps
-): ReactElement<PrivateRouteProps> => {
+const PrivateRoute = (props: PrivateRouteProps): ReactElement<PrivateRouteProps> => {
  const { component, path, exact } = props;
  const appContext = useContext(AppContext);
-  return appContext.isLoggedIn ? (
+
+  return appContext.isLoggedIn ?
    <Route component={component} path={path} exact={exact} />
-  ) : (
+    :
    <Redirect to="/login" />
-  );
 };

-export default PrivateRoute;
+export default PrivateRoute;
--- a/sasjs-tests/src/TestSuiteRunner.scss
+++ b/sasjs-tests/src/TestSuiteRunner.scss
@@ -0,0 +1,19 @@
+.button-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 16px;
+
+  .loading-spinner {
+    margin: 0 8px;
+  }
+
+  .submit-button {
+    padding: 10px;
+    min-height: 80px;
+    font-size: 2em;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+}
--- a/sasjs-tests/src/TestSuiteRunner.tsx
+++ b/sasjs-tests/src/TestSuiteRunner.tsx
@@ -0,0 +1,125 @@
+import React, { useEffect, useState, ReactElement, useContext } from "react";
+import TestSuiteComponent from "./components/TestSuite";
+import TestSuiteCard from "./components/TestSuiteCard";
+import { TestSuite, Test } from "./types";
+import { basicTests } from "./testSuites/Basic"; // FIXME: declared but never used
+import "./TestSuiteRunner.scss";
+import SASjs from "sasjs";
+import { AppContext } from "./context/AppContext";
+import { sendArrTests, sendObjTests } from "./testSuites/RequestData"; // FIXME: declared but never used
+import { specialCaseTests } from "./testSuites/SpecialCases";
+import { sasjsRequestTests } from "./testSuites/SasjsRequests"; // FIXME: declared but never used
+
+interface TestSuiteRunnerProps {
+  adapter: SASjs;
+}
+
+const TestSuiteRunner = (props: TestSuiteRunnerProps): ReactElement<TestSuiteRunnerProps> => {
+  const { adapter } = props;
+  const { config } = useContext(AppContext); // FIXME: declared but never used
+  const [testSuites, setTestSuites] = useState<TestSuite[]>([]);
+  const [runTests, setRunTests] = useState(false);
+  const [completedTestSuites, setCompletedTestSuites] = useState< // FIXME: create interface
+    {
+      name: string;
+      completedTests: {
+        test: Test;
+        result: boolean;
+        error: Error | null;
+        executionTime: number;
+      }[];
+    }[]
+  >([]);
+  const [currentTestSuite, setCurrentTestSuite] = useState<TestSuite | null>(
+    (null as unknown) as TestSuite
+  );
+
+  useEffect(() => {
+    if (adapter) {
+      setTestSuites([
+        // basicTests(adapter, config.userName, config.password),
+        // sendArrTests(adapter),
+        // sendObjTests(adapter),
+        specialCaseTests(adapter),
+        // sasjsRequestTests(adapter),
+      ]);
+      setCompletedTestSuites([]);
+    }
+  }, [adapter]);
+
+  useEffect(() => {
+    if (testSuites.length) {
+      setCurrentTestSuite(testSuites[0]);
+    }
+  }, [testSuites]);
+
+  useEffect(() => {
+    if (runTests) {
+      setCompletedTestSuites([]);
+      setCurrentTestSuite(testSuites[0]);
+    }
+  }, [runTests, testSuites]);
+
+  return (
+    <>
+      <div className="button-container">
+        <button
+          className={runTests ? "submit-button disabled" : "submit-button"} // TODO: 'submit-button' class should be assigned by default
+          onClick={() => setRunTests(true)}
+          disabled={runTests}
+        >
+          {runTests ? (
+            <>
+            {
+                // FIXME: fragment is not needed in this case
+            }
+              <div className="loading-spinner"></div>Running tests... 
+            </>
+          ) : (
+            "Run tests!"
+          )}
+        </button>
+      </div>
+      {completedTestSuites.map((completedTestSuite, index) => { // TODO: refactor
+        return (
+          <TestSuiteCard
+            key={index}
+            tests={completedTestSuite.completedTests}
+            name={completedTestSuite.name}
+          />
+        );
+      })}
+      {currentTestSuite && runTests && (
+        <TestSuiteComponent
+          {...currentTestSuite}
+          onCompleted={(
+            name,
+            completedTests: {
+              test: Test;
+              result: boolean;
+              error: Error | null;
+              executionTime: number;
+            }[]
+          ) => {
+            const currentIndex = testSuites.indexOf(currentTestSuite);
+            const nextIndex = currentIndex < testSuites.length - 1 ? currentIndex + 1 : -1;
+
+            if (nextIndex >= 0) setCurrentTestSuite(testSuites[nextIndex]);
+            else setCurrentTestSuite(null);
+
+            const newCompletedTestSuites = [
+              ...completedTestSuites,
+              { name, completedTests },
+            ];
+
+            setCompletedTestSuites(newCompletedTestSuites);
+
+            if (newCompletedTestSuites.length === testSuites.length) setRunTests(false);
+          }}
+        />
+      )}
+    </>
+  );
+};
+
+export default TestSuiteRunner;
--- a/sasjs-tests/src/components/Test.tsx
+++ b/sasjs-tests/src/components/Test.tsx
@@ -0,0 +1,87 @@
+import React, { ReactElement, useEffect, useState } from "react";
+import TestCard from "./TestCard";
+import { start } from "repl"; // FIXME: declared but never used
+
+interface TestProps {
+  title: string;
+  description: string;
+  beforeTest?: (...args: any) => Promise<any>;
+  afterTest?: (...args: any) => Promise<any>;
+  test: (context: any) => Promise<any>;
+  assertion: (...args: any) => boolean;
+  onCompleted: (payload: {
+    result: boolean;
+    error: Error | null;
+    executionTime: number;
+  }) => void;
+  context: any;
+}
+
+const getStatus = (isRunning: boolean, isPassed: boolean): string => {
+  return isRunning ? "running" : isPassed ? "passed" : "failed";
+};
+
+const Test = (props: TestProps): ReactElement<TestProps> => {
+  const {
+    title,
+    description,
+    test,
+    beforeTest,
+    afterTest,
+    assertion,
+    onCompleted,
+    context,
+  } = props;
+  const beforeTestFunction = beforeTest ? beforeTest : () => Promise.resolve();
+  const afterTestFunction = afterTest ? afterTest : () => Promise.resolve();
+  const [isRunning, setIsRunning] = useState(false);
+  const [isPassed, setIsPassed] = useState(false);
+
+  useEffect(() => {
+    if (test && assertion) {
+      const startTime = new Date().valueOf()
+
+      setIsRunning(true);
+      setIsPassed(false);
+
+      beforeTestFunction()
+        .then(() => test(context))
+        .then((res) => {
+          setIsRunning(false);
+          setIsPassed(assertion(res, context))
+
+          return Promise.resolve(assertion(res, context));
+        })
+        .then((testResult) => {
+          afterTestFunction();
+
+          const endTime = new Date().valueOf();
+          const executionTime = (endTime - startTime) / 1000;
+
+          onCompleted({ result: testResult, error: null, executionTime });
+        })
+        .catch((e) => {
+          setIsRunning(false);
+          setIsPassed(false);
+
+          console.error(e);
+
+          const endTime = new Date().valueOf();
+          const executionTime = (endTime - startTime) / 1000;
+
+          onCompleted({ result: false, error: e, executionTime });
+        });
+    }
+  }, [test, assertion]);
+
+  return (
+    <TestCard
+      title={title}
+      description={description}
+      status={getStatus(isRunning, isPassed)}
+      error={null}
+    />
+  );
+};
+
+export default Test;
--- a/sasjs-tests/src/components/TestCard.scss
+++ b/sasjs-tests/src/components/TestCard.scss
@@ -0,0 +1,62 @@
+.test {
+  display: inline-flex;
+  padding: 8px;
+  margin: 8px;
+  flex-direction: column;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  width: 20%;
+
+  .title {
+    font-weight: bold;
+    color: #eee;
+    font-size: 1em;
+  }
+
+  .description,
+  .execution-time {
+    color: #c6c0c0;
+    padding: 8px 0;
+    font-size: 0.8em;
+  }
+
+  .description {
+    min-height: 50px;
+  }
+
+  .execution-time {
+    color: #f9e804;
+  }
+
+  .icon {
+    border-radius: 50%;
+    width: 12px;
+    height: 12px;
+    margin-right: 8px;
+    display: inline-block;
+
+    &.running {
+      background-color: yellow;
+    }
+
+    &.passed {
+      background-color: green;
+    }
+
+    &.failed {
+      background-color: red;
+    }
+  }
+}
+
+@media only screen and (max-width: 900px) {
+  .test {
+    width: 90%;
+  }
+}
+
+@media only screen and (min-width: 901px) and (max-width: 1280px) {
+  .test {
+    width: 30%;
+  }
+}
--- a/sasjs-tests/src/components/TestCard.tsx
+++ b/sasjs-tests/src/components/TestCard.tsx
@@ -0,0 +1,43 @@
+import React, { ReactElement } from "react";
+import "./TestCard.scss";
+
+interface TestCardProps {
+  title: string;
+  description: string;
+  status: string;
+  error: Error | null;
+  executionTime?: number;
+}
+const TestCard = (props: TestCardProps): ReactElement<TestCardProps> => {
+  const { title, description, status, error, executionTime } = props;
+
+  return (
+    <div className="test">
+      <code className="title">{title}</code>
+      <span className="description">{description}</span>
+      <span className="execution-time">
+        {executionTime ? executionTime.toFixed(2) + "s" : ""}
+      </span>
+      {status === "running" && ( // FIXME: use switch statement
+        <div>
+          <span className="icon running"></span>Running...
+        </div>
+      )}
+      {status === "passed" && (
+        <div>
+          <span className="icon passed"></span>Passed
+        </div>
+      )}
+      {status === "failed" && (
+        <>
+          <div>
+            <span className="icon failed"></span>Failed
+          </div>
+          {!!error && <code>{error.message}</code>}
+        </>
+      )}
+    </div>
+  );
+};
+
+export default TestCard;
--- a/sasjs-tests/src/components/TestSuite.tsx
+++ b/sasjs-tests/src/components/TestSuite.tsx
@@ -0,0 +1,101 @@
+import React, { ReactElement, useState, useEffect } from "react";
+import "./TestSuiteCard.scss";
+import { Test } from "../types";
+import TestComponent from "./Test";
+import TestCard from "./TestCard";
+
+interface TestSuiteProps {
+  name: string;
+  tests: Test[];
+  beforeAll?: (...args: any) => Promise<any>;
+  afterAll?: (...args: any) => Promise<any>;
+  onCompleted: (
+    name: string,
+    completedTests: {
+      test: Test;
+      result: boolean;
+      error: Error | null;
+      executionTime: number;
+    }[]
+  ) => void;
+}
+const TestSuite = (props: TestSuiteProps): ReactElement<TestSuiteProps> => {
+  const { name, tests, beforeAll, afterAll, onCompleted } = props;
+  const [context, setContext] = useState<any>(null);
+  const [completedTests, setCompletedTests] = useState< // TODO: create an interface
+    {
+      test: Test;
+      result: boolean;
+      error: Error | null;
+      executionTime: number;
+    }[]
+  >([]);
+  const [currentTest, setCurrentTest] = useState<Test | null>(
+    (null as unknown) as Test // ?
+  );
+
+  useEffect(() => {
+    if (beforeAll) beforeAll().then((data) => setContext({ data }))
+  }, [beforeAll]);
+
+  useEffect(() => {
+    if (tests.length) setCurrentTest(tests[0])
+
+    setCompletedTests([]);
+    setContext(null);
+  }, [tests]);
+
+  return (!!beforeAll && !!context) || !beforeAll ? ( // ?
+    <div className="test-suite">
+      <div className="test-suite-name running">{name}</div>
+      {currentTest && (
+        <TestComponent
+          {...currentTest}
+          context={context}
+          onCompleted={(completedTest) => {
+            const newCompleteTests = [
+              ...completedTests,
+              {
+                test: currentTest,
+                result: completedTest.result,
+                error: completedTest.error,
+                executionTime: completedTest.executionTime,
+              },
+            ]
+
+            setCompletedTests(newCompleteTests);
+
+            const currentIndex = tests.indexOf(currentTest);
+            const nextIndex = currentIndex < tests.length - 1 ? currentIndex + 1 : -1;
+
+            if (nextIndex >= 0) setCurrentTest(tests[nextIndex]);
+            else setCurrentTest(null);
+
+            if (newCompleteTests.length === tests.length) {
+              if (afterAll) afterAll().then(() => onCompleted(name, newCompleteTests))
+              else onCompleted(name, newCompleteTests)
+            }
+          }}
+        />
+      )}
+      {completedTests.map((test, index) => {
+        const { test, result, error } = test;
+        const { title, description } = test;
+
+        return (
+          <TestCard
+            key={index}
+            title={title}
+            description={description}
+            status={result === true ? "passed" : "failed"}
+            error={error}
+          />
+        );
+      })}
+    </div>
+  ) : (
+    <></> // FIXME: use {null} instead
+  );
+};
+
+export default TestSuite;
--- a/sasjs-tests/src/components/TestSuiteCard.scss
+++ b/sasjs-tests/src/components/TestSuiteCard.scss
@@ -0,0 +1,19 @@
+.test-suite {
+    .test-suite-name {
+        font-size: 1.5em;
+        font-weight: bold;
+        color: #1f2027;
+
+        &.passed {
+            color: green;
+        }
+
+        &.failed {
+            color: red;
+        }
+
+        &.running {
+            color: yellow;
+        }
+    }
+}
--- a/sasjs-tests/src/components/TestSuiteCard.tsx
+++ b/sasjs-tests/src/components/TestSuiteCard.tsx
@@ -0,0 +1,43 @@
+import React, { ReactElement } from "react";
+import "./TestSuiteCard.scss";
+import { Test } from "../types";
+import TestCard from "./TestCard";
+
+interface TestSuiteCardProps {
+  name: string;
+  tests: {
+    test: Test;
+    result: boolean;
+    error: Error | null;
+    executionTime: number;
+  }[];
+}
+const TestSuiteCard = (props: TestSuiteCardProps): ReactElement<TestSuiteCardProps> => {
+  const { name, tests } = props;
+  const overallStatus = tests.map((t) => t.result).reduce((x, y) => x && y); // TODO: refactor variable names
+
+  return (
+    <div className="test-suite">
+      <div className={`test-suite-name ${overallStatus ? "passed" : "failed"}`}>
+        {name}
+      </div>
+      {tests.map((test, index) => {
+        const { test, result, error, executionTime } = test;
+        const { title, description } = test;
+
+        return (
+          <TestCard
+            key={index}
+            title={title}
+            description={description}
+            status={result === true ? "passed" : "failed"}
+            error={error}
+            executionTime={executionTime}
+          />
+        );
+      })}
+    </div>
+  );
+};
+
+export default TestSuiteCard;
--- a/sasjs-tests/src/context/AppContext.tsx
+++ b/sasjs-tests/src/context/AppContext.tsx
@@ -0,0 +1,52 @@
+import React, { createContext, useState, useEffect, ReactNode } from "react";
+import SASjs from "sasjs";
+
+export const AppContext = createContext<{ // TODO: create an interface
+  config: any; // TODO: be more specific on type declaration
+  sasJsConfig: any; // TODO: be more specific on type declaration
+  isLoggedIn: boolean;
+  setIsLoggedIn: (value: boolean) => void;
+  adapter: SASjs;
+}>({
+  config: null,
+  sasJsConfig: null,
+  isLoggedIn: false,
+  setIsLoggedIn: (null as unknown) as (value: boolean) => void,
+  adapter: (null as unknown) as SASjs,
+});
+
+export const AppProvider = (props: { children: ReactNode }) => {
+  const [config, setConfig] = useState<{ sasJsConfig: any }>({sasJsConfig: null}); // TODO: be more specific on type declaration
+  const [adapter, setAdapter] = useState<SASjs>((null as unknown) as SASjs);
+  const [isLoggedIn, setIsLoggedIn] = useState(false);
+
+  useEffect(() => {
+    fetch("config.json") // TODO: use axios instead of fetch
+      .then((res) => res.json())
+      .then((configJson: any) => { // TODO: be more specific on type declaration
+        setConfig(configJson);
+
+        const sasjs = new SASjs(configJson.sasJsConfig);
+
+        setAdapter(sasjs);
+
+        sasjs.checkSession().then((response) => {
+          setIsLoggedIn(response.isLoggedIn);
+        }); // FIXME: add catch block
+      });// FIXME: add catch block
+  }, []);
+
+  return (
+    <AppContext.Provider
+      value={{
+        config,
+        sasJsConfig: config.sasJsConfig,
+        isLoggedIn,
+        setIsLoggedIn,
+        adapter,
+      }}
+    >
+      {props.children}
+    </AppContext.Provider>
+  );
+};
--- a/sasjs-tests/src/index.tsx
+++ b/sasjs-tests/src/index.tsx
@@ -3,7 +3,7 @@ import ReactDOM from "react-dom";
 import { Route, HashRouter, Switch } from "react-router-dom";
 import "./index.scss";
 import * as serviceWorker from "./serviceWorker";
-import { AppProvider } from "@sasjs/test-framework";
+import { AppProvider } from "./context/AppContext";
 import PrivateRoute from "./PrivateRoute";
 import Login from "./Login";
 import App from "./App";
--- a/sasjs-tests/src/testSuites/Basic.ts
+++ b/sasjs-tests/src/testSuites/Basic.ts
@@ -1,5 +1,5 @@
-import SASjs, { ServerType, SASjsConfig } from "@sasjs/adapter";
-import { TestSuite } from "@sasjs/test-framework";
+import SASjs, { ServerType, SASjsConfig } from "sasjs";
+import { TestSuite } from "../types";

 const defaultConfig: SASjsConfig = {
  serverUrl: window.location.origin,
@@ -9,7 +9,6 @@ const defaultConfig: SASjsConfig = {
  serverType: ServerType.SASViya,
  debug: true,
  contextName: "SAS Job Execution compute context",
-  useComputeApi: false,
 };

 const customConfig = {
@@ -34,18 +33,16 @@ export const basicTests = (
      test: async () => {
        return adapter.logIn(userName, password);
      },
-      assertion: (response: any) =>
+      assertion: (response: any) => // FIXME: be more specific on type declaration
        response && response.isLoggedIn && response.userName === userName,
    },
    {
      title: "Default config",
-      description:
-        "Should instantiate with default config when none is provided",
-      test: async () => {
-        return Promise.resolve(new SASjs());
-      },
+      description: "Should instantiate with default config when none is provided",
+      test: async () => Promise.resolve(new SASjs()),
      assertion: (sasjsInstance: SASjs) => {
        const sasjsConfig = sasjsInstance.getSasjsConfig();
+        
        return (
          sasjsConfig.serverUrl === defaultConfig.serverUrl &&
          sasjsConfig.pathSAS9 === defaultConfig.pathSAS9 &&
--- a/sasjs-tests/src/testSuites/RequestData.ts
+++ b/sasjs-tests/src/testSuites/RequestData.ts
@@ -1,12 +1,12 @@
-import SASjs from "@sasjs/adapter";
-import { TestSuite } from "@sasjs/test-framework";
+import SASjs from "sasjs";
+import { TestSuite } from "../types";

-const stringData: any = { table1: [{ col1: "first col value" }] };
-const numericData: any = { table1: [{ col1: 3.14159265 }] };
-const multiColumnData: any = {
+const stringData: any = { table1: [{ col1: "first col value" }] }; // TODO: be more specific on type declaration
+const numericData: any = { table1: [{ col1: 3.14159265 }] }; // TODO: be more specific on type declaration
+const multiColumnData: any = { // TODO: be more specific on type declaration
  table1: [{ col1: 42, col2: 1.618, col3: "x", col4: "x" }],
 };
-const multipleRowsWithNulls: any = {
+const multipleRowsWithNulls: any = { // TODO: be more specific on type declaration
  table1: [
    { col1: 42, col2: null, col3: "x", col4: "" },
    { col1: 42, col2: null, col3: "x", col4: "" },
@@ -15,7 +15,7 @@ const multipleRowsWithNulls: any = {
    { col1: 42, col2: 1.62, col3: "x", col4: "x" },
  ],
 };
-const multipleColumnsWithNulls: any = {
+const multipleColumnsWithNulls: any = { // TODO: be more specific on type declaration
  table1: [
    { col1: 42, col2: null, col3: "x", col4: null },
    { col1: 42, col2: null, col3: "x", col4: null },
@@ -25,21 +25,20 @@ const multipleColumnsWithNulls: any = {
  ],
 };

-const getLongStringData = (length = 32764) => {
+const getLongStringData = (length = 32764) => { // FIXME: add type declaration
  let x = "X";
-  for (let i = 1; i <= length; i++) {
-    x = x + "X";
-  }
-  const data: any = { table1: [{ col1: x }] };
+
+  for (let i = 1; i <= length; i++) x += 'X'
+
+  const data: any = { table1: [{ col1: x }] }; // TODO: be more specific on type declaration
+
  return data;
 };

 const getLargeObjectData = () => {
  const data = { table1: [{ big: "data" }] };

-  for (let i = 1; i < 10000; i++) {
-    data.table1.push(data.table1[0]);
-  }
+  for (let i = 1; i < 10000; i++) data.table1.push(data.table1[0])

  return data;
 };
@@ -50,12 +49,8 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
    {
      title: "Single string value",
      description: "Should send an array with a single string value",
-      test: () => {
-        return adapter.request("common/sendArr", stringData);
-      },
-      assertion: (res: any) => {
-        return res.table1[0][0] === stringData.table1[0].col1;
-      },
+      test: () => adapter.request("common/sendArr", stringData),
+      assertion: (res: any) => res.table1[0][0] === stringData.table1[0].col1 // TODO: be more specific on type declaration
    },
    {
      title: "Long string value",
@@ -64,21 +59,17 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendArr", getLongStringData());
      },
-      assertion: (res: any) => {
-        const longStringData = getLongStringData();
-        return res.table1[0][0] === longStringData.table1[0].col1;
-      },
+      assertion: (res: any) => res.table1[0][0] === getLongStringData().table1[0].col1 // TODO: be more specific on type declaration
    },
    {
      title: "Overly long string value",
      description:
        "Should error out with long string values over 32765 characters",
-      test: () => {
-        const data = getLongStringData(32767);
-        return adapter.request("common/sendArr", data).catch((e) => e);
-      },
-      assertion: (error: any) => {
-        return !!error && !!error.MESSAGE;
+      test: () => adapter
+        .request("common/sendArr", getLongStringData(32767))
+        .catch((e) => e), // TODO: rename
+      assertion: (error: any) => { // TODO: be more specific on type declaration
+        return !!error && !!error.MESSAGE; // FIXME: refactor
      },
    },
    {
@@ -87,7 +78,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendArr", numericData);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        return res.table1[0][0] === numericData.table1[0].col1;
      },
    },
@@ -97,7 +88,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendArr", multiColumnData);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        return (
          res.table1[0][0] === multiColumnData.table1[0].col1 &&
          res.table1[0][1] === multiColumnData.table1[0].col2 &&
@@ -112,9 +103,10 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendArr", multipleRowsWithNulls);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        let result = true;
-        multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
+        multipleRowsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
+            // FIXME: use loop
          result =
            result &&
            res.table1[index][0] === multipleRowsWithNulls.table1[index].col1;
@@ -128,6 +120,7 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
            result &&
            res.table1[index][3] === multipleRowsWithNulls.table1[index].col4;
        });
+
        return result;
      },
    },
@@ -137,9 +130,9 @@ export const sendArrTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendArr", multipleColumnsWithNulls);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        let result = true;
-        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
+        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
          result =
            result &&
            res.table1[index][0] ===
@@ -170,12 +163,12 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      title: "Invalid column name",
      description: "Should throw an error",
      test: async () => {
-        const invalidData: any = {
+        const invalidData: any = { // TODO: be more specific on type declaration
          "1 invalid table": [{ col1: 42 }],
        };
        return adapter.request("common/sendObj", invalidData).catch((e) => e);
      },
-      assertion: (error: any) => !!error && !!error.MESSAGE,
+      assertion: (error: any) => !!error && !!error.MESSAGE, // TODO: be more specific on type declaration
    },
    {
      title: "Single string value",
@@ -183,7 +176,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", stringData);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        return res.table1[0].COL1 === stringData.table1[0].col1;
      },
    },
@@ -194,7 +187,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", getLongStringData());
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        const longStringData = getLongStringData();
        return res.table1[0].COL1 === longStringData.table1[0].col1;
      },
@@ -208,7 +201,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
          .request("common/sendObj", getLongStringData(32767))
          .catch((e) => e);
      },
-      assertion: (error: any) => {
+      assertion: (error: any) => { // TODO: be more specific on type declaration
        return !!error && !!error.MESSAGE;
      },
    },
@@ -218,7 +211,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", numericData);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        return res.table1[0].COL1 === numericData.table1[0].col1;
      },
    },
@@ -229,7 +222,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", getLargeObjectData());
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        const data = getLargeObjectData();
        return res.table1[9000].BIG === data.table1[9000].big;
      },
@@ -240,7 +233,7 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", multiColumnData);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        return (
          res.table1[0].COL1 === multiColumnData.table1[0].col1 &&
          res.table1[0].COL2 === multiColumnData.table1[0].col2 &&
@@ -255,9 +248,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", multipleRowsWithNulls);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        let result = true;
-        multipleRowsWithNulls.table1.forEach((_: any, index: number) => {
+        multipleRowsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
          result =
            result &&
            res.table1[index].COL1 === multipleRowsWithNulls.table1[index].col1;
@@ -280,9 +273,9 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      test: () => {
        return adapter.request("common/sendObj", multipleColumnsWithNulls);
      },
-      assertion: (res: any) => {
+      assertion: (res: any) => { // TODO: be more specific on type declaration
        let result = true;
-        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => {
+        multipleColumnsWithNulls.table1.forEach((_: any, index: number) => { // TODO: be more specific on type declaration
          result =
            result &&
            res.table1[index].COL1 ===
@@ -304,4 +297,4 @@ export const sendObjTests = (adapter: SASjs): TestSuite => ({
      },
    },
  ],
-});
+});
--- a/sasjs-tests/src/testSuites/SasjsRequests.ts
+++ b/sasjs-tests/src/testSuites/SasjsRequests.ts
@@ -1,7 +1,7 @@
-import SASjs from "@sasjs/adapter";
-import { TestSuite } from "@sasjs/test-framework";
+import SASjs from "sasjs";
+import { TestSuite } from "../types";

-const data: any = { table1: [{ col1: "first col value" }] };
+const data: any = { table1: [{ col1: "first col value" }] }; // TODO: be more specific on type declaration

 export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
  name: "SASjs Requests",
@@ -9,16 +9,11 @@ export const sasjsRequestTests = (adapter: SASjs): TestSuite => ({
    {
      title: "WORK tables",
      description: "Should get WORK tables after request",
-      test: async () => {
-        return adapter.request("common/sendArr", data);
-      },
-      assertion: () => {
+      test: async () => adapter.request("common/sendArr", data),
+      assertion: (res: any) => {
        const requests = adapter.getSasRequests();
-        if (adapter.getSasjsConfig().debug) {
-          return requests[0].SASWORK !== null;
-        } else {
-          return requests[0].SASWORK === null;
-        }
+
+        return adapter.getSasjsConfig().debug ? requests[0].SASWORK !== null : requests[0].SASWORK === null
      },
    },
  ],
--- a/sasjs-tests/src/testSuites/SpecialCases.ts
+++ b/sasjs-tests/src/testSuites/SpecialCases.ts
@@ -1,7 +1,7 @@
-import SASjs from "@sasjs/adapter";
-import { TestSuite } from "@sasjs/test-framework";
+import SASjs from "sasjs";
+import { TestSuite } from "../types";

-const specialCharData: any = {
+const specialCharData: any = { // TODO: be more specific on type definition 
  table1: [
    {
      tab: "\t",
@@ -9,8 +9,8 @@ const specialCharData: any = {
      cr: "\r",
      semicolon: ";semi",
      percent: "%",
-      singleQuote: "'",
-      doubleQuote: '"',
+      singleQuote: "'", // TODO: use ``
+      doubleQuote: '"', // TODO: use ``
      crlf: "\r\n",
      euro: "€euro",
      banghash: "!#banghash",
@@ -18,7 +18,7 @@ const specialCharData: any = {
  ],
 };

-const moreSpecialCharData: any = {
+const moreSpecialCharData: any = { // TODO: be more specific on type definition 
  table1: [
    {
      speech0: '"speech',
@@ -36,44 +36,46 @@ const moreSpecialCharData: any = {
  ],
 };

-const getWideData = () => {
-  const cols: any = {};
-  for (let i = 1; i <= 10000; i++) {
+const getWideData = () => { // FIXME: declared but never used
+  const cols: any = {}; // TODO: be more specific on type definition 
+  for (let i = 1; i <= 10000; i++) { // Why 10000?
    cols["col" + i] = "test" + i;
  }

-  const data: any = {
+  const data: any = { // TODO: be more specific on type definition 
    table1: [cols],
  };

  return data;
 };

-const getTables = () => {
-  const tables: any = {};
+const getTables = () => { // FIXME: declared but never used
+  const tables: any = {}; // TODO: be more specific on type definition 

-  for (let i = 1; i <= 100; i++) {
+  for (let i = 1; i <= 100; i++) { // why 100
    tables["table" + i] = [{ col1: "x", col2: "x", col3: "x", col4: "x" }];
  }
+
  return tables;
 };

 const getLargeDataset = () => {
-  const rows: any = [];
-  const colData: string =
-    "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+  const rows: any = []; // TODO: be more specific on type definition 
+  const colData: string = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; // FIXME: no need to explicitly mention data type
+
  for (let i = 1; i <= 10000; i++) {
    rows.push({ col1: colData, col2: colData, col3: colData, col4: colData });
  }

-  const data: any = {
+  const data: any = { // TODO: be more specific on type definition 
    table1: rows,
  };

  return data;
 };

-const errorAndCsrfData: any = {
+// FIXME: declared but never used
+const errorAndCsrfData: any = { // TODO: be more specific on type definition 
  error: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
  _csrf: [{ col1: "q", col2: "w", col3: "e", col4: "r" }],
 };
@@ -84,10 +86,8 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
    {
      title: "Common special characters",
      description: "Should handle common special characters",
-      test: () => {
-        return adapter.request("common/sendArr", specialCharData);
-      },
-      assertion: (res: any) => {
+      test: () => adapter.request("common/sendArr", specialCharData),
+      assertion: (res: any) => { // TODO: be more specific on type definition 
        return (
          res.table1[0][0] === specialCharData.table1[0].tab &&
          res.table1[0][1] === specialCharData.table1[0].lf &&
@@ -102,149 +102,136 @@ export const specialCaseTests = (adapter: SASjs): TestSuite => ({
        );
      },
    },
+    // TODO: delete commented out code
+
+    // {
+    //   title: "Other special characters",
+    //   description: "Should handle other special characters",
+    //   test: () => {
+    //     return adapter.request("common/sendArr", moreSpecialCharData);
+    //   },
+    //   assertion: (res: any) => {
+    //     return (
+    //       res.table1[0][0] === moreSpecialCharData.table1[0].speech0 &&
+    //       res.table1[0][1] === moreSpecialCharData.table1[0].pct &&
+    //       res.table1[0][2] === moreSpecialCharData.table1[0].speech &&
+    //       res.table1[0][3] === moreSpecialCharData.table1[0].slash &&
+    //       res.table1[0][4] === moreSpecialCharData.table1[0].slashWithSpecial &&
+    //       res.table1[0][5] === moreSpecialCharData.table1[0].macvar &&
+    //       res.table1[0][6] === moreSpecialCharData.table1[0].chinese &&
+    //       res.table1[0][7] === moreSpecialCharData.table1[0].sigma &&
+    //       res.table1[0][8] === moreSpecialCharData.table1[0].at &&
+    //       res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
+    //       res.table1[0][10] === moreSpecialCharData.table1[0].dollar
+    //     );
+    //   },
+    // },
+    // {
+    //   title: "Wide table with sendArr",
+    //   description: "Should handle data with 10000 columns",
+    //   test: () => {
+    //     return adapter.request("common/sendArr", getWideData());
+    //   },
+    //   assertion: (res: any) => {
+    //     const data = getWideData();
+    //     let result = true;
+    //     for (let i = 0; i <= 10; i++) {
+    //       result =
+    //         result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
+    //     }
+    //     return result;
+    //   },
+    // },
+    // {
+    //   title: "Wide table with sendObj",
+    //   description: "Should handle data with 10000 columns",
+    //   test: () => {
+    //     return adapter.request("common/sendObj", getWideData());
+    //   },
+    //   assertion: (res: any) => {
+    //     const data = getWideData();
+    //     let result = true;
+    //     for (let i = 0; i <= 10; i++) {
+    //       result =
+    //         result &&
+    //         res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
+    //     }
+    //     return result;
+    //   },
+    // },
+    // {
+    //   title: "Multiple tables",
+    //   description: "Should handle data with 100 tables",
+    //   test: () => {
+    //     return adapter.request("common/sendArr", getTables());
+    //   },
+    //   assertion: (res: any) => {
+    //     const data = getTables();
+    //     return (
+    //       res.table1[0][0] === data.table1[0].col1 &&
+    //       res.table1[0][1] === data.table1[0].col2 &&
+    //       res.table1[0][2] === data.table1[0].col3 &&
+    //       res.table1[0][3] === data.table1[0].col4 &&
+    //       res.table50[0][0] === data.table50[0].col1 &&
+    //       res.table50[0][1] === data.table50[0].col2 &&
+    //       res.table50[0][2] === data.table50[0].col3 &&
+    //       res.table50[0][3] === data.table50[0].col4
+    //     );
+    //   },
+    // },
    {
-      title: "Other special characters",
-      description: "Should handle other special characters",
-      test: () => {
-        return adapter.request("common/sendArr", moreSpecialCharData);
-      },
-      assertion: (res: any) => {
-        return (
-          res.table1[0][0] === moreSpecialCharData.table1[0].speech0 &&
-          res.table1[0][1] === moreSpecialCharData.table1[0].pct &&
-          res.table1[0][2] === moreSpecialCharData.table1[0].speech &&
-          res.table1[0][3] === moreSpecialCharData.table1[0].slash &&
-          res.table1[0][4] === moreSpecialCharData.table1[0].slashWithSpecial &&
-          res.table1[0][5] === moreSpecialCharData.table1[0].macvar &&
-          res.table1[0][6] === moreSpecialCharData.table1[0].chinese &&
-          res.table1[0][7] === moreSpecialCharData.table1[0].sigma &&
-          res.table1[0][8] === moreSpecialCharData.table1[0].at &&
-          res.table1[0][9] === moreSpecialCharData.table1[0].serbian &&
-          res.table1[0][10] === moreSpecialCharData.table1[0].dollar
-        );
-      },
-    },
-    {
-      title: "Wide table with sendArr",
-      description: "Should handle data with 10000 columns",
-      test: () => {
-        return adapter.request("common/sendArr", getWideData());
-      },
-      assertion: (res: any) => {
-        const data = getWideData();
-        let result = true;
-        for (let i = 0; i <= 10; i++) {
-          result =
-            result && res.table1[0][i] === data.table1[0]["col" + (i + 1)];
-        }
-        return result;
-      },
-    },
-    {
-      title: "Wide table with sendObj",
-      description: "Should handle data with 10000 columns",
-      test: () => {
-        return adapter.request("common/sendObj", getWideData());
-      },
-      assertion: (res: any) => {
-        const data = getWideData();
-        let result = true;
-        for (let i = 0; i <= 10; i++) {
-          result =
-            result &&
-            res.table1[0]["COL" + (i + 1)] === data.table1[0]["col" + (i + 1)];
-        }
-        return result;
-      },
-    },
-    {
-      title: "Multiple tables",
-      description: "Should handle data with 100 tables",
-      test: () => {
-        return adapter.request("common/sendArr", getTables());
-      },
-      assertion: (res: any) => {
-        const data = getTables();
-        return (
-          res.table1[0][0] === data.table1[0].col1 &&
-          res.table1[0][1] === data.table1[0].col2 &&
-          res.table1[0][2] === data.table1[0].col3 &&
-          res.table1[0][3] === data.table1[0].col4 &&
-          res.table50[0][0] === data.table50[0].col1 &&
-          res.table50[0][1] === data.table50[0].col2 &&
-          res.table50[0][2] === data.table50[0].col3 &&
-          res.table50[0][3] === data.table50[0].col4
-        );
-      },
-    },
-    {
-      title: "Large dataset with sendObj",
+      title: "Large dataset",
      description: "Should handle 5mb of data",
-      test: () => {
-        return adapter.request("common/sendObj", getLargeDataset());
-      },
-      assertion: (res: any) => {
+      test: () => adapter.request("common/sendArr", getLargeDataset()),
+      assertion: (res: any) => { // TODO: be more specific on type definition 
        const data = getLargeDataset();
-        let result = true;
+        let result = true; // TODO: rename
+
        for (let i = 0; i <= 10; i++) {
          result = result && res.table1[i][0] === data.table1[i][0];
        }
+
        return result;
      },
    },
-    {
-      title: "Large dataset with sendArr",
-      description: "Should handle 5mb of data",
-      test: () => {
-        return adapter.request("common/sendArr", getLargeDataset());
-      },
-      assertion: (res: any) => {
-        const data = getLargeDataset();
-        let result = true;
-        for (let i = 0; i <= 10; i++) {
-          result =
-            result && res.table1[i][0] === Object.values(data.table1[i])[0];
-        }
-        return result;
-      },
-    },
-    {
-      title: "Error and _csrf tables with sendArr",
-      description: "Should handle error and _csrf tables",
-      test: () => {
-        return adapter.request("common/sendArr", errorAndCsrfData);
-      },
-      assertion: (res: any) => {
-        return (
-          res.error[0][0] === errorAndCsrfData.error[0].col1 &&
-          res.error[0][1] === errorAndCsrfData.error[0].col2 &&
-          res.error[0][2] === errorAndCsrfData.error[0].col3 &&
-          res.error[0][3] === errorAndCsrfData.error[0].col4 &&
-          res._csrf[0][0] === errorAndCsrfData._csrf[0].col1 &&
-          res._csrf[0][1] === errorAndCsrfData._csrf[0].col2 &&
-          res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
-          res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
-        );
-      },
-    },
-    {
-      title: "Error and _csrf tables with sendObj",
-      description: "Should handle error and _csrf tables",
-      test: () => {
-        return adapter.request("common/sendObj", errorAndCsrfData);
-      },
-      assertion: (res: any) => {
-        return (
-          res.error[0].COL1 === errorAndCsrfData.error[0].col1 &&
-          res.error[0].COL2 === errorAndCsrfData.error[0].col2 &&
-          res.error[0].COL3 === errorAndCsrfData.error[0].col3 &&
-          res.error[0].COL4 === errorAndCsrfData.error[0].col4 &&
-          res._csrf[0].COL1 === errorAndCsrfData._csrf[0].col1 &&
-          res._csrf[0].COL2 === errorAndCsrfData._csrf[0].col2 &&
-          res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
-          res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
-        );
-      },
-    },
+
+    // {
+    //   title: "Error and _csrf tables with sendArr",
+    //   description: "Should handle error and _csrf tables",
+    //   test: () => {
+    //     return adapter.request("common/sendArr", errorAndCsrfData);
+    //   },
+    //   assertion: (res: any) => {
+    //     return (
+    //       res.error[0][0] === errorAndCsrfData.error[0].col1 &&
+    //       res.error[0][1] === errorAndCsrfData.error[0].col2 &&
+    //       res.error[0][2] === errorAndCsrfData.error[0].col3 &&
+    //       res.error[0][3] === errorAndCsrfData.error[0].col4 &&
+    //       res._csrf[0][0] === errorAndCsrfData._csrf[0].col1 &&
+    //       res._csrf[0][1] === errorAndCsrfData._csrf[0].col2 &&
+    //       res._csrf[0][2] === errorAndCsrfData._csrf[0].col3 &&
+    //       res._csrf[0][3] === errorAndCsrfData._csrf[0].col4
+    //     );
+    //   },
+    // },
+    // {
+    //   title: "Error and _csrf tables with sendObj",
+    //   description: "Should handle error and _csrf tables",
+    //   test: () => {
+    //     return adapter.request("common/sendObj", errorAndCsrfData);
+    //   },
+    //   assertion: (res: any) => {
+    //     return (
+    //       res.error[0].COL1 === errorAndCsrfData.error[0].col1 &&
+    //       res.error[0].COL2 === errorAndCsrfData.error[0].col2 &&
+    //       res.error[0].COL3 === errorAndCsrfData.error[0].col3 &&
+    //       res.error[0].COL4 === errorAndCsrfData.error[0].col4 &&
+    //       res._csrf[0].COL1 === errorAndCsrfData._csrf[0].col1 &&
+    //       res._csrf[0].COL2 === errorAndCsrfData._csrf[0].col2 &&
+    //       res._csrf[0].COL3 === errorAndCsrfData._csrf[0].col3 &&
+    //       res._csrf[0].COL4 === errorAndCsrfData._csrf[0].col4
+    //     );
+    //   },
+    // },
  ],
-});
+});
--- a/sasjs-tests/src/types/index.ts
+++ b/sasjs-tests/src/types/index.ts
@@ -0,0 +1,15 @@
+export interface Test {
+  title: string;
+  description: string;
+  beforeTest?: (...args: any) => Promise<any>;
+  afterTest?: (...args: any) => Promise<any>;
+  test: (context?: any) => Promise<any>;
+  assertion: (...args: any) => boolean;
+}
+
+export interface TestSuite {
+  name: string;
+  tests: Test[];
+  beforeAll?: (...args: any) => Promise<any>;
+  afterAll?: (...args: any) => Promise<any>;
+}
--- a/sasjs-tests/src/utils/Assert.ts
+++ b/sasjs-tests/src/utils/Assert.ts
@@ -3,20 +3,21 @@ export const assert = (
  message = "Assertion failed"
 ) => {
  let result;
+
  try {
-    if (typeof expression === "boolean") {
-      result = expression;
-    } else {
-      result = expression();
-    }
+    if (typeof expression === "boolean") result = expression;
+    else result = expression();
  } catch (e) {
    console.error(message);
+
    throw new Error(message);
  }
+
  if (!!result) {
    return;
  } else {
    console.error(message);
+
    throw new Error(message);
  }
 };
--- a/sasjs-tests/src/utils/UploadFile.ts
+++ b/sasjs-tests/src/utils/UploadFile.ts
@@ -0,0 +1,27 @@
+export const uploadFile = (file: File, fileName: string, url: string) => {
+  return new Promise((resolve, reject) => {
+    const data = new FormData();
+    data.append("file", file);
+    data.append("filename", fileName);
+
+    const xhr = new XMLHttpRequest();
+    xhr.withCredentials = true;
+    xhr.addEventListener("readystatechange", function () { // TODO: use ES6
+      if (this.readyState === 4) {
+        let response: any;
+
+        try {
+          response = JSON.parse(this.responseText);
+        } catch (e) {
+          reject(e);
+        }
+
+        resolve(response);
+      }
+    });
+
+    xhr.open("POST", url);
+    xhr.setRequestHeader("cache-control", "no-cache");
+    xhr.send(data);
+  });
+};
--- a/src/FileUploader.ts
+++ b/src/FileUploader.ts
@@ -1,97 +0,0 @@
-import { isLogInRequired, needsRetry } from "./utils";
-import { CsrfToken } from "./types/CsrfToken";
-import { UploadFile } from "./types/UploadFile";
-
-const requestRetryLimit = 5;
-
-export class FileUploader {
-  constructor(
-    private appLoc: string,
-    private serverUrl: string,
-    private jobsPath: string,
-    private csrfToken: CsrfToken | null = null
-  ) {}
-  private retryCount = 0;
-
-  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
-    if (files?.length < 1) throw new Error("Atleast one file must be provided");
-
-    let paramsString = "";
-
-    for (let param in params) {
-      if (params.hasOwnProperty(param)) {
-        paramsString += `&${param}=${params[param]}`;
-      }
-    }
-
-    const program = this.appLoc
-      ? this.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
-      : sasJob;
-    const uploadUrl = `${this.serverUrl}${this.jobsPath}/?${
-      "_program=" + program
-    }${paramsString}`;
-
-    const headers = {
-      "cache-control": "no-cache",
-    };
-
-    return new Promise((resolve, reject) => {
-      const formData = new FormData();
-
-      for (let file of files) {
-        formData.append("file", file.file, file.fileName);
-      }
-
-      if (this.csrfToken) formData.append("_csrf", this.csrfToken.value);
-
-      fetch(uploadUrl, {
-        method: "POST",
-        body: formData,
-        referrerPolicy: "same-origin",
-        headers,
-      })
-        .then(async (response) => {
-          if (!response.ok) {
-            if (response.status === 403) {
-              const tokenHeader = response.headers.get("X-CSRF-HEADER");
-
-              if (tokenHeader) {
-                const token = response.headers.get(tokenHeader);
-                this.csrfToken = {
-                  headerName: tokenHeader,
-                  value: token || "",
-                };
-              }
-            }
-          }
-
-          return response.text();
-        })
-        .then((responseText) => {
-          if (isLogInRequired(responseText))
-            reject("You must be logged in to upload a fle");
-
-          if (needsRetry(responseText)) {
-            if (this.retryCount < requestRetryLimit) {
-              this.retryCount++;
-              this.uploadFile(sasJob, files, params).then(
-                (res: any) => resolve(res),
-                (err: any) => reject(err)
-              );
-            } else {
-              this.retryCount = 0;
-              reject(responseText);
-            }
-          } else {
-            this.retryCount = 0;
-
-            try {
-              resolve(JSON.parse(responseText));
-            } catch (e) {
-              reject(e);
-            }
-          }
-        });
-    });
-  }
-}
--- a/src/SAS9ApiClient.ts
+++ b/src/SAS9ApiClient.ts
@@ -3,49 +3,49 @@
 *
 */
 export class SAS9ApiClient {
-  constructor(private serverUrl: string) {}
+    constructor(private serverUrl: string) {}

-  /**
-   * returns on object containing the server URL
-   */
-  public getConfig() {
-    return {
-      serverUrl: this.serverUrl,
-    };
-  }
+    /**
+     * @returns an object containing the server URL
+     */
+    public getConfig() {
+        return {
+            serverUrl: this.serverUrl,
+        }
+    }

-  /**
-   * Updates serverurl which is not null
-   * @param serverUrl - the URL of the server.
-   */
-  public setConfig(serverUrl: string) {
-    if (serverUrl) this.serverUrl = serverUrl;
-  }
+    /**
+     * Updates serverUrl which is not null
+     * @param serverUrl - the URL of the server.
+     */
+    public setConfig(serverUrl: string) {
+        if (serverUrl) this.serverUrl = serverUrl
+    }

-  /**
-   * Executes code on a SAS9 server.
-   * @param linesOfCode - an array of lines of code to execute
-   * @param serverName - the server to execute the code on
-   * @param repositoryName - the repository to execute the code on
-   */
-  public async executeScript(
-    linesOfCode: string[],
-    serverName: string,
-    repositoryName: string
-  ) {
-    const requestPayload = linesOfCode.join("\n");
-    const executeScriptRequest = {
-      method: "PUT",
-      headers: {
-        Accept: "application/json",
-      },
-      body: `command=${requestPayload}`,
-    };
-    const executeScriptResponse = await fetch(
-      `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
-      executeScriptRequest
-    ).then((res) => res.text());
+    /**
+     * Executes code on a SAS9 server.
+     * @param linesOfCode - an array of lines of code to execute
+     * @param serverName - the server to execute the code on
+     * @param repositoryName - the repository to execute the code on
+     */
+    public async executeScript(
+        linesOfCode: string[], // FIXME: rename
+        serverName: string,
+        repositoryName: string
+    ) {
+        const requestPayload = linesOfCode.join('\n')
+        const executeScriptRequest = {
+            method: 'PUT',
+            headers: {Accept: 'application/json'},
+            body: `command=${requestPayload}`,
+        }
+        // FIXME: use axios instead of fetch
+        const executeScriptResponse = await fetch( 
+            `${this.serverUrl}/sas/servers/${serverName}/cmd?repositoryName=${repositoryName}`,
+            executeScriptRequest
+        ).then((res) => res.text())
+        // FIXME: no catch block

-    return executeScriptResponse;
-  }
-}
+        return executeScriptResponse
+    }
+}
--- a/src/SASViyaApiClient.ts
+++ b/src/SASViyaApiClient.ts
@@ -1,3 +1,13 @@
+/**
+ * TODO: needs to be split into logical blocks:
+ * - Folder
+ * - Config
+ * - Context
+ * - Session
+ * - Job
+ * - Auth
+ */
+
 import {
  isAuthorizeFormRequired,
  parseAndSubmitAuthorizeForm,
@@ -6,10 +16,7 @@ import {
 } from "./utils";
 import * as NodeFormData from "form-data";
 import * as path from "path";
-import { Job, Session, Context, Folder, CsrfToken } from "./types";
-import { JobDefinition } from "./types/JobDefinition";
-import { formatDataForRequest } from "./utils/formatDataForRequest";
-import { SessionManager } from "./SessionManager";
+import { Job, Session, Context, Folder } from "./types";

 /**
 * A client for interfacing with the SAS Viya REST API
@@ -19,21 +26,14 @@ export class SASViyaApiClient {
  constructor(
    private serverUrl: string,
    private rootFolderName: string,
-    private contextName: string,
-    private setCsrfToken: (csrfToken: CsrfToken) => void,
    private rootFolderMap = new Map<string, Job[]>()
  ) {
    if (!rootFolderName) {
      throw new Error("Root folder must be provided.");
    }
  }
-  private csrfToken: CsrfToken | null = null;
+  private csrfToken: { headerName: string; value: string } | null = null;
  private rootFolder: Folder | null = null;
-  private sessionManager = new SessionManager(
-    this.serverUrl,
-    this.contextName,
-    this.setCsrfToken
-  );

  /**
   * Returns a map containing the directory structure in the currently set root folder.
@@ -78,7 +78,7 @@ export class SASViyaApiClient {
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
-    const { result: contexts } = await this.request<{ items: Context[] }>(
+    const contexts = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -103,8 +103,7 @@ export class SASViyaApiClient {
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
-
-    const { result: contexts } = await this.request<{ items: Context[] }>(
+    const contexts = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -117,7 +116,9 @@ export class SASViyaApiClient {
        `test-${context.name}`,
        linesOfCode,
        context.name,
-        accessToken
+        accessToken,
+        undefined,
+        true
      ).catch(() => null);
    });
    const results = await Promise.all(promises);
@@ -162,7 +163,7 @@ export class SASViyaApiClient {
      headers.Authorization = `Bearer ${accessToken}`;
    }

-    const { result: contexts } = await this.request<{ items: Context[] }>(
+    const contexts = await this.request<{ items: Context[] }>(
      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
@@ -181,7 +182,7 @@ export class SASViyaApiClient {
        "Content-Type": "application/json",
      },
    };
-    const { result: createdSession } = await this.request<Session>(
+    const createdSession = this.request<Session>(
      `${this.serverUrl}/compute/contexts/${executionContext.id}/sessions`,
      createSessionRequest
    );
@@ -199,143 +200,98 @@ export class SASViyaApiClient {
   * @param silent - optional flag to turn of logging.
   */
  public async executeScript(
-    jobName: string,
+    fileName: string,
    linesOfCode: string[],
    contextName: string,
    accessToken?: string,
-    silent = false,
-    data = null,
-    debug = false
+    sessionId = "",
+    silent = false
  ) {
-    silent = !debug;
    const headers: any = {
      "Content-Type": "application/json",
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
-    let executionSessionId: string;
-    const session = await this.sessionManager.getSession(accessToken);
-    executionSessionId = session!.id;
-
-    const jobArguments: { [key: string]: any } = {
-      _contextName: contextName,
-      _OMITJSONLISTING: true,
-      _OMITJSONLOG: true,
-      _OMITSESSIONRESULTS: true,
-      _OMITTEXTLISTING: true,
-      _OMITTEXTLOG: true,
-    };
-
-    if (debug) {
-      jobArguments["_OMITTEXTLOG"] = false;
-      jobArguments["_OMITSESSIONRESULTS"] = false;
-      jobArguments["_DEBUG"] = 131;
+    if (this.csrfToken) {
+      headers[this.csrfToken.headerName] = this.csrfToken.value;
    }
-
-    const fileName = `exec-${
-      jobName.includes("/") ? jobName.split("/")[1] : jobName
-    }`;
-
-    let jobVariables: any = {
-      SYS_JES_JOB_URI: "",
-      _program: this.rootFolderName + "/" + jobName,
-    };
-    let files: any[] = [];
-    if (data) {
-      if (JSON.stringify(data).includes(";")) {
-        files = await this.uploadTables(data, accessToken);
-        jobVariables["_webin_file_count"] = files.length;
-        files.forEach((fileInfo, index) => {
-          jobVariables[
-            `_webin_fileuri${index + 1}`
-          ] = `/files/files/${fileInfo.file.id}`;
-          jobVariables[`_webin_name${index + 1}`] = fileInfo.tableName;
-        });
-      } else {
-        jobVariables = { ...jobVariables, ...formatDataForRequest(data) };
-      }
-    }
-
-    // Execute job in session
-    const postJobRequest = {
-      method: "POST",
-      headers,
-      body: JSON.stringify({
-        name: fileName,
-        description: "Powered by SASjs",
-        code: linesOfCode,
-        variables: jobVariables,
-        arguments: jobArguments,
-      }),
-    };
-    const { result: postedJob, etag } = await this.request<Job>(
-      `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
-      postJobRequest
-    );
-    if (!silent) {
-      console.log(`Job has been submitted for ${fileName}`);
-      console.log(
-        `You can monitor the job progress at ${this.serverUrl}${
-          postedJob.links.find((l: any) => l.rel === "state")!.href
-        }`
-      );
-    }
-
-    const jobStatus = await this.pollJobState(
-      postedJob,
-      etag,
-      accessToken,
-      silent
-    );
-    const { result: currentJob } = await this.request<Job>(
-      `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs/${postedJob.id}`,
+    const contexts = await this.request<{ items: Context[] }>(
+      `${this.serverUrl}/compute/contexts`,
      { headers }
    );
+    const executionContext =
+      contexts.items && contexts.items.length
+        ? contexts.items.find((c: any) => c.name === contextName)
+        : null;

-    let jobResult, log;
-    if (jobStatus === "failed" || jobStatus === "error") {
-      return Promise.reject(currentJob.error);
-    }
-    const resultLink = `/compute/sessions/${executionSessionId}/filerefs/_webout/content`;
-    const logLink = currentJob.links.find((l) => l.rel === "log");
-    if (resultLink) {
-      jobResult = await this.request<any>(
-        `${this.serverUrl}${resultLink}`,
-        { headers },
-        "text"
-      ).catch((e) => ({
-        result: JSON.stringify(e),
-      }));
-    }
-
-    if (true && logLink) {
-      log = await this.request<any>(
-        `${this.serverUrl}${logLink.href}/content?limit=10000`,
-        {
+    if (executionContext) {
+      // Request new session in context or use the ID passed in
+      let executionSessionId: string;
+      if (sessionId) {
+        executionSessionId = sessionId;
+      } else {
+        const createSessionRequest = {
+          method: "POST",
          headers,
-        }
-      ).then((res: any) => res.result.items.map((i: any) => i.line).join("\n"));
+        };
+        const createdSession = await this.request<Session>(
+          `${this.serverUrl}/compute/contexts/${executionContext.id}/sessions`,
+          createSessionRequest
+        );
+
+        executionSessionId = createdSession.id;
+      }
+      // Execute job in session
+      const postJobRequest = {
+        method: "POST",
+        headers,
+        body: JSON.stringify({
+          name: fileName,
+          description: "Powered by SASjs",
+          code: linesOfCode,
+        }),
+      };
+      const postedJob = await this.request<Job>(
+        `${this.serverUrl}/compute/sessions/${executionSessionId}/jobs`,
+        postJobRequest
+      );
+      if (!silent) {
+        console.log(`Job has been submitted for ${fileName}`);
+        console.log(
+          `You can monitor the job progress at ${this.serverUrl}${
+            postedJob.links.find((l: any) => l.rel === "state")!.href
+          }`
+        );
+      }
+
+      const jobStatus = await this.pollJobState(postedJob, accessToken, silent);
+      const logLink = postedJob.links.find((l: any) => l.rel === "log");
+      if (logLink) {
+        const log = await this.request(
+          `${this.serverUrl}${logLink.href}?limit=100000`,
+          {
+            headers,
+          }
+        );
+
+        return { jobStatus, log };
+      }
+    } else {
+      console.error(
+        `Unable to find execution context ${contextName}.\nPlease check the contextName in the tgtDeployVars and try again.`
+      );
+      console.error("Response from server: ", JSON.stringify(contexts));
    }
-
-    await this.sessionManager.clearSession(executionSessionId, accessToken);
-
-    return { result: jobResult?.result, log };
-    // } else {
-    //   console.error(
-    //     `Unable to find execution context ${contextName}.\nPlease check the contextName in the tgtDeployVars and try again.`
-    //   );
-    //   console.error("Response from server: ", JSON.stringify(this.contexts));
-    // }
  }

  /**
-   * Creates a folder in the specified location.  Either parentFolderPath or
-   *   parentFolderUri must be provided.
+   * Creates a folder in the specified location.  Either parentFolderPath or 
+   *   parentFolderUri must be provided.  
   * @param folderName - the name of the new folder.
-   * @param parentFolderPath - the full path to the parent folder.  If not
+   * @param parentFolderPath - the full path to the parent folder.  If not 
   *  provided, the parentFolderUri must be provided.
-   * @param parentFolderUri - the URI (eg /folders/folders/UUID) of the parent
+   * @param parentFolderUri - the URI (eg /folders/folders/UUID) of the parent 
   *  folder.  If not provided, the parentFolderPath must be provided.
   */
  public async createFolder(
@@ -350,27 +306,17 @@ export class SASViyaApiClient {

    if (!parentFolderUri && parentFolderPath) {
      parentFolderUri = await this.getFolderUri(parentFolderPath, accessToken);
-      if (!parentFolderUri) {
+      if (!parentFolderUri){
        console.log(`Parent folder is not present: ${parentFolderPath}`);

-        const newParentFolderPath = parentFolderPath.substring(
-          0,
-          parentFolderPath.lastIndexOf("/")
-        );
+        const newParentFolderPath = parentFolderPath.substring(0, parentFolderPath.lastIndexOf("/"));
        const newFolderName = `${parentFolderPath.split("/").pop()}`;
-        if (newParentFolderPath === "") {
+        if (newParentFolderPath === ""){
          throw new Error("Root Folder should have been present on server");
        }
-        console.log(
-          `Creating Parent Folder:\n${newFolderName} in ${newParentFolderPath}`
-        );
-        const parentFolder = await this.createFolder(
-          newFolderName,
-          newParentFolderPath,
-          undefined,
-          accessToken
-        );
-        console.log(`Parent Folder "${newFolderName}" successfully created.`);
+        console.log(`Creating Parent Folder:\n${newFolderName} in ${newParentFolderPath}`)
+        const parentFolder = await this.createFolder(newFolderName, newParentFolderPath, undefined, accessToken)
+        console.log(`Parent Folder "${newFolderName}" successfully created.`)
        parentFolderUri = `/folders/folders/${parentFolder.id}`;
      }
    }
@@ -388,7 +334,7 @@ export class SASViyaApiClient {
      createFolderRequest.headers.Authorization = `Bearer ${accessToken}`;
    }

-    const { result: createFolderResponse } = await this.request<Folder>(
+    const createFolderResponse = await this.request<Folder>(
      `${this.serverUrl}/folders/folders?parentFolderUri=${parentFolderUri}`,
      createFolderRequest
    );
@@ -414,9 +360,7 @@ export class SASViyaApiClient {
    accessToken?: string
  ) {
    if (!parentFolderPath && !parentFolderUri) {
-      throw new Error(
-        "Either parentFolderPath or parentFolderUri must be provided"
-      );
+      throw new Error('Either parentFolderPath or parentFolderUri must be provided');
    }

    if (!parentFolderUri && parentFolderPath) {
@@ -431,12 +375,12 @@ export class SASViyaApiClient {
      },
      body: JSON.stringify({
        name: jobName,
-        parameters: [
+        parameters:[
          {
-            name: "_addjesbeginendmacros",
-            type: "CHARACTER",
-            defaultValue: "false",
-          },
+            "name":"_addjesbeginendmacros",
+            "type":"CHARACTER",
+            "defaultValue":"false"
+          }
        ],
        type: "Compute",
        code,
@@ -610,74 +554,6 @@ export class SASViyaApiClient {
    return deleteResponse;
  }

-  /**
-   * Executes a job via the SAS Viya Compute API
-   * @param sasJob - the relative path to the job.
-   * @param contextName - the name of the context where the job is to be executed.
-   * @param debug - sets the _debug flag in the job arguments.
-   * @param data - any data to be passed in as input to the job.
-   * @param accessToken - an optional access token for an authorized user.
-   */
-  public async executeComputeJob(
-    sasJob: string,
-    contextName: string,
-    debug: boolean,
-    data?: any,
-    accessToken?: string
-  ) {
-    if (!this.rootFolder) {
-      await this.populateRootFolder(accessToken);
-    }
-    if (!this.rootFolder) {
-      console.error("Root folder was not found");
-      throw new Error("Root folder was not found");
-    }
-    if (!this.rootFolderMap.size) {
-      await this.populateRootFolderMap(accessToken);
-    }
-    if (!this.rootFolderMap.size) {
-      console.error(
-        `The job ${sasJob} was not found in ${this.rootFolderName}`
-      );
-      throw new Error(
-        `The job ${sasJob} was not found in ${this.rootFolderName}`
-      );
-    }
-
-    const headers: any = { "Content-Type": "application/json" };
-    if (!!accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`;
-    }
-
-    const folderName = sasJob.split("/")[0];
-    const jobName = sasJob.split("/")[1];
-    const jobFolder = this.rootFolderMap.get(folderName);
-    const jobToExecute = jobFolder?.find((item) => item.name === jobName);
-    const jobDefinitionLink = jobToExecute?.links.find(
-      (l) => l.rel === "getResource"
-    );
-    if (!jobDefinitionLink) {
-      console.error("Job definition URI was not found.");
-      throw new Error("Job definition URI was not found.");
-    }
-    const { result: jobDefinition } = await this.request<JobDefinition>(
-      `${this.serverUrl}${jobDefinitionLink.href}`,
-      headers
-    );
-    const linesToExecute = jobDefinition.code
-      .replace(/\r\n/g, "\n")
-      .split("\n");
-    return await this.executeScript(
-      sasJob,
-      linesToExecute,
-      contextName,
-      accessToken,
-      true,
-      data,
-      debug
-    );
-  }
-
  /**
   * Executes a job via the SAS Viya Job Execution API
   * @param sasJob - the relative path to the job.
@@ -729,7 +605,7 @@ export class SASViyaApiClient {
        headers.Authorization = `Bearer ${accessToken}`;
      }
      requestInfo.headers = headers;
-      const { result: jobDefinition } = await this.request<Job>(
+      const jobDefinition = await this.request<Job>(
        `${this.serverUrl}${jobDefinitionLink}`,
        requestInfo
      );
@@ -746,15 +622,15 @@ export class SASViyaApiClient {
      };

      if (debug) {
-        jobArguments["_OMITTEXTLOG"] = "false";
-        jobArguments["_OMITSESSIONRESULTS"] = "false";
-        jobArguments["_DEBUG"] = 131;
+        jobArguments["_omittextlog"] = "false";
+        jobArguments["_omitsessionresults"] = "false";
+        jobArguments["_debug"] = 131;
      }

      files.forEach((fileInfo, index) => {
        jobArguments[
          `_webin_fileuri${index + 1}`
-        ] = `/files/files/${fileInfo.file.id}`;
+        ] = `/files/files/${fileInfo.id}`;
        jobArguments[`_webin_name${index + 1}`] = fileInfo.tableName;
      });

@@ -768,45 +644,25 @@ export class SASViyaApiClient {
          arguments: jobArguments,
        }),
      };
-      const { result: postedJob, etag } = await this.request<Job>(
+      const postedJob = await this.request<Job>(
        `${this.serverUrl}/jobExecution/jobs?_action=wait`,
        postJobRequest
      );
-      const jobStatus = await this.pollJobState(
-        postedJob,
-        etag,
-        accessToken,
-        true
-      );
-      const { result: currentJob } = await this.request<Job>(
+      const jobStatus = await this.pollJobState(postedJob, accessToken, true);
+      const currentJob = await this.request<Job>(
        `${this.serverUrl}/jobExecution/jobs/${postedJob.id}`,
        { headers }
      );
-
-      let jobResult, log;
-      if (jobStatus === "failed") {
-        return Promise.reject(currentJob.error);
-      }
      const resultLink = currentJob.results["_webout.json"];
-      const logLink = currentJob.links.find((l) => l.rel === "log");
      if (resultLink) {
-        jobResult = await this.request<any>(
+        const result = await this.request<any>(
          `${this.serverUrl}${resultLink}/content`,
-          { headers },
-          "text"
+          { headers }
        );
+        return result;
      }
-      if (debug && logLink) {
-        log = await this.request<any>(
-          `${this.serverUrl}${logLink.href}/content`,
-          {
-            headers,
-          }
-        ).then((res: any) =>
-          res.result.items.map((i: any) => i.line).join("\n")
-        );
-      }
-      return { result: jobResult?.result, log };
+
+      return postedJob;
    } else {
      throw new Error(
        `The job ${sasJob} was not found at the location ${this.rootFolderName}`
@@ -823,14 +679,14 @@ export class SASViyaApiClient {
    if (accessToken) {
      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
    }
-    const { result: folder } = await this.request<Folder>(
+    const folder = await this.request<Folder>(
      `${this.serverUrl}${url}`,
      requestInfo
    );
-    if (!folder) {
+    if (!folder){
      throw new Error("Cannot populate RootFolderMap unless rootFolder exists");
    }
-    const { result: members } = await this.request<{ items: any[] }>(
+    const members = await this.request<{ items: any[] }>(
      `${this.serverUrl}/folders/folders/${folder.id}/members`,
      requestInfo
    );
@@ -845,7 +701,7 @@ export class SASViyaApiClient {
          this.rootFolderName +
          "/" +
          member.name;
-        const { result: memberDetail } = await this.request<Folder>(
+        const memberDetail = await this.request<Folder>(
          `${this.serverUrl}${subFolderUrl}`,
          requestInfo
        );
@@ -854,7 +710,7 @@ export class SASViyaApiClient {
          (l: any) => l.rel === "members"
        );

-        const { result: memberContents } = await this.request<{ items: any[] }>(
+        const memberContents = await this.request<{ items: any[] }>(
          `${this.serverUrl}${membersLink!.href}`,
          requestInfo
        );
@@ -875,37 +731,29 @@ export class SASViyaApiClient {
    if (accessToken) {
      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
    }
-    let error;
    const rootFolder = await this.request<Folder>(
      `${this.serverUrl}${url}`,
      requestInfo
-    );
+    ).catch(() => null);

-    this.rootFolder = rootFolder?.result || null;
-    if (error) {
-      throw new Error(JSON.stringify(error));
-    }
+    this.rootFolder = rootFolder;
  }

  private async pollJobState(
    postedJob: any,
-    etag: string | null,
    accessToken?: string,
    silent = false
  ) {
-    const MAX_POLL_COUNT = 1000;
-    const POLL_INTERVAL = 100;
    let postedJobState = "";
    let pollCount = 0;
    const headers: any = {
      "Content-Type": "application/json",
-      "If-None-Match": etag,
    };
    if (accessToken) {
      headers.Authorization = `Bearer ${accessToken}`;
    }
    const stateLink = postedJob.links.find((l: any) => l.rel === "state");
-    return new Promise(async (resolve, _) => {
+    return new Promise((resolve, _) => {
      const interval = setInterval(async () => {
        if (
          postedJobState === "running" ||
@@ -916,8 +764,8 @@ export class SASViyaApiClient {
            if (!silent) {
              console.log("Polling job status... \n");
            }
-            const { result: jobState } = await this.request<string>(
-              `${this.serverUrl}${stateLink.href}?_action=wait&wait=30`,
+            const jobState = await this.request<string>(
+              `${this.serverUrl}${stateLink.href}?wait=30`,
              {
                headers,
              },
@@ -929,7 +777,7 @@ export class SASViyaApiClient {
              console.log(`Current state: ${postedJobState}\n`);
            }
            pollCount++;
-            if (pollCount >= MAX_POLL_COUNT) {
+            if (pollCount >= 100) {
              resolve(postedJobState);
            }
          }
@@ -937,50 +785,7 @@ export class SASViyaApiClient {
          clearInterval(interval);
          resolve(postedJobState);
        }
-      }, POLL_INTERVAL);
-    });
-  }
-
-  private async waitForSession(
-    session: Session,
-    etag: string | null,
-    accessToken?: string,
-    silent = false
-  ) {
-    let sessionState = session.state;
-    let pollCount = 0;
-    const headers: any = {
-      "Content-Type": "application/json",
-      "If-None-Match": etag,
-    };
-    if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`;
-    }
-    const stateLink = session.links.find((l: any) => l.rel === "state");
-    return new Promise(async (resolve, _) => {
-      if (sessionState === "pending") {
-        if (stateLink) {
-          if (!silent) {
-            console.log("Polling session status... \n");
-          }
-          const { result: state } = await this.request<string>(
-            `${this.serverUrl}${stateLink.href}?wait=30`,
-            {
-              headers,
-            },
-            "text"
-          );
-
-          sessionState = state.trim();
-          if (!silent) {
-            console.log(`Current state: ${sessionState}\n`);
-          }
-          pollCount++;
-          resolve(sessionState);
-        }
-      } else {
-        resolve(sessionState);
-      }
+      }, 100);
    });
  }

@@ -1007,7 +812,7 @@ export class SASViyaApiClient {
        headers,
      };

-      const { result: file } = await this.request<any>(
+      const file = await this.request<any>(
        `${this.serverUrl}/files/files#rawUpload`,
        createFileRequest
      );
@@ -1019,28 +824,21 @@ export class SASViyaApiClient {

  private async getFolderUri(folderPath: string, accessToken?: string) {
    const url = "/folders/folders/@item?path=" + folderPath;
-    const requestInfo: any = {
-      method: "GET",
-    };
-    if (accessToken) {
-      requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
-    }
-    const { result: folder } = await this.request<Folder>(
-      `${this.serverUrl}${url}`,
-      requestInfo
-    ).catch((err) => {
-      return { result: null };
-    });
-
-    if (!folder) return undefined;
-    return `/folders/folders/${folder.id}`;
+      const requestInfo: any = {
+        method: "GET",
+      };
+      if (accessToken) {
+        requestInfo.headers = { Authorization: `Bearer ${accessToken}` };
+      }
+      const folder = await this.request<Folder>(
+        `${this.serverUrl}${url}`,
+        requestInfo
+      );
+      if (!folder)
+        return undefined;
+      return `/folders/folders/${folder.id}`;
  }

-  setCsrfTokenLocal = (csrfToken: CsrfToken) => {
-    this.csrfToken = csrfToken;
-    this.setCsrfToken(csrfToken);
-  };
-
  private async request<T>(
    url: string,
    options: RequestInit,
@@ -1055,7 +853,7 @@ export class SASViyaApiClient {
    return await makeRequest<T>(
      url,
      options,
-      this.setCsrfTokenLocal,
+      (csrfToken) => (this.csrfToken = csrfToken),
      contentType
    );
  }
--- a/src/SASjs.spec.ts
+++ b/src/SASjs.spec.ts
@@ -2,6 +2,7 @@ import SASjs from "./index";

 const adapter = new SASjs();

+// FIXME: adapter doesn't have 'parseSAS9SourceCode' and 'parseGeneratedCode'
 it("should parse SAS9 source code", async done => {
  expect(sampleResponse).toBeTruthy();
  const parsedSourceCode = (adapter as any).parseSAS9SourceCode(sampleResponse);
--- a/src/SASjs.ts
+++ b/src/SASjs.ts
@@ -1,3 +1,16 @@
+/**
+ * TODO: needs to be split into logical blocks:
+ * - Execute
+ * - Context
+ * - Session
+ * - Folder and services
+ * - Job
+ * - Auth
+ * - Config
+ * - Debug
+ * - Response
+ */
+
 import "isomorphic-fetch";
 import * as e6p from "es6-promise";
 (e6p as any).polyfill();
@@ -20,12 +33,9 @@ import {
  SASjsRequest,
  SASjsWaitingRequest,
  ServerType,
-  CsrfToken,
-  UploadFile,
 } from "./types";
 import { SASViyaApiClient } from "./SASViyaApiClient";
 import { SAS9ApiClient } from "./SAS9ApiClient";
-import { FileUploader } from "./FileUploader";

 const defaultConfig: SASjsConfig = {
  serverUrl: "",
@@ -35,7 +45,6 @@ const defaultConfig: SASjsConfig = {
  serverType: ServerType.SASViya,
  debug: true,
  contextName: "SAS Job Execution compute context",
-  useComputeApi: false,
 };

 const requestRetryLimit = 5;
@@ -45,21 +54,18 @@ const requestRetryLimit = 5;
 *
 */
 export default class SASjs {
-  private sasjsConfig: SASjsConfig = new SASjsConfig();
+  private sasjsConfig = new SASjsConfig();
  private jobsPath: string = "";
  private logoutUrl: string = "";
  private loginUrl: string = "";
-  private csrfTokenApi: CsrfToken | null = null;
-  private csrfTokenWeb: CsrfToken | null = null;
-  private retryCountWeb: number = 0;
-  private retryCountComputeApi: number = 0;
-  private retryCountJeseApi: number = 0;
+  private _csrf: string | null = null;
+  private _csrfHeader: string | null = null;
+  private retryCount: number = 0;
  private sasjsRequests: SASjsRequest[] = [];
  private sasjsWaitingRequests: SASjsWaitingRequest[] = [];
  private userName: string = "";
  private sasViyaApiClient: SASViyaApiClient | null = null;
  private sas9ApiClient: SAS9ApiClient | null = null;
-  private fileUploader: FileUploader | null = null;

  constructor(config?: any) {
    this.sasjsConfig = {
@@ -122,6 +128,7 @@ export default class SASjs {
      linesOfCode,
      contextName,
      accessToken,
+      sessionId,
      silent
    );
  }
@@ -240,19 +247,11 @@ export default class SASjs {
  }

  /**
-   * Returns the _csrf token of the current session for the API approach
+   * Returns the _csrf token of the current session.
   *
   */
-  public getCsrfApi() {
-    return this.csrfTokenApi?.value;
-  }
-
-  /**
-   * Returns the _csrf token of the current session for the WEB approach.
-   *
-   */
-  public getCsrfWeb() {
-    return this.csrfTokenWeb?.value;
+  public getCsrf() {
+    return this._csrf;
  }

  /**
@@ -376,26 +375,6 @@ export default class SASjs {
    });
  }

-  /**
-   * Uploads a file to the given service
-   * @param sasJob - The path to the SAS program (ultimately resolves to
-   *  the SAS `_program` parameter to run a Job Definition or SAS 9 Stored
-   *  Process.)  Is prepended at runtime with the value of `appLoc`.
-   * @param file - Array of files to be uploaded, including File object and file name.
-   * @param params - Request URL paramaters
-   */
-  public uploadFile(sasJob: string, files: UploadFile[], params: any) {
-    const fileUploader =
-      this.fileUploader ||
-      new FileUploader(
-        this.sasjsConfig.appLoc,
-        this.sasjsConfig.serverUrl,
-        this.jobsPath,
-        this.csrfTokenWeb
-      );
-    return fileUploader.uploadFile(sasJob, files, params);
-  }
-
  /**
   * Makes a request to the SAS Service specified in `SASjob`.  The response
   * object will always contain table names in lowercase, and column names in
@@ -407,9 +386,8 @@ export default class SASjs {
   *  Process.)  Is prepended at runtime with the value of `appLoc`.
   * @param data - A JSON object containing one or more tables to be sent to
   * SAS.  Can be `null` if no inputs required.
-   * @param config - Provide any changes to the config here, for instance to
-   * enable / disable `debug`. Any change provided will override the global config,
-   * for that particular function call.
+   * @param params - Provide any changes to the config here, for instance to
+   * enable / disable `debug`.
   * @param loginRequiredCallback - provide a function here to be called if the
   * user is not logged in (eg to display a login form).  The request will be
   * resubmitted after logon.
@@ -417,118 +395,7 @@ export default class SASjs {
  public async request(
    sasJob: string,
    data: any,
-    config: any = {},
-    loginRequiredCallback?: any,
-    accessToken?: string
-  ) {
-    let requestResponse;
-
-    config = {
-      ...this.sasjsConfig,
-      ...config,
-    };
-
-    sasJob = sasJob.startsWith("/") ? sasJob.replace("/", "") : sasJob;
-
-    if (config.serverType === ServerType.SASViya && config.contextName) {
-      if (config.useComputeApi) {
-        requestResponse = await this.executeJobViaComputeApi(
-          sasJob,
-          data,
-          config,
-          loginRequiredCallback,
-          accessToken
-        );
-
-        this.retryCountComputeApi = 0;
-      } else {
-        requestResponse = await this.executeJobViaJesApi(
-          sasJob,
-          data,
-          config,
-          loginRequiredCallback,
-          accessToken
-        );
-
-        this.retryCountJeseApi = 0;
-      }
-    } else {
-      requestResponse = await this.executeJobViaWeb(
-        sasJob,
-        data,
-        config,
-        loginRequiredCallback
-      );
-    }
-
-    return requestResponse;
-  }
-
-  /**
-   * Creates the folders and services in the provided JSON on the given location
-   * (appLoc) on the given server (serverUrl).
-   * @param serviceJson - the JSON specifying the folders and services to be created.
-   * @param appLoc - the base folder in which to create the new folders and
-   * services.  If not provided, is taken from SASjsConfig.
-   * @param serverUrl - the server on which to deploy the folders and services.
-   * If not provided, is taken from SASjsConfig.
-   * @param accessToken - an optional access token to be passed in when
-   * using this function from the command line.
-   */
-  public async deployServicePack(
-    serviceJson: any,
-    appLoc?: string,
-    serverUrl?: string,
-    accessToken?: string
-  ) {
-    if (this.sasjsConfig.serverType !== ServerType.SASViya) {
-      throw new Error("This operation is only supported on SAS Viya servers.");
-    }
-
-    let sasApiClient: any = null;
-    if (serverUrl || appLoc) {
-      if (!serverUrl) {
-        serverUrl = this.sasjsConfig.serverUrl;
-      }
-      if (!appLoc) {
-        appLoc = this.sasjsConfig.appLoc;
-      }
-      if (this.sasjsConfig.serverType === ServerType.SASViya) {
-        sasApiClient = new SASViyaApiClient(
-          serverUrl,
-          appLoc,
-          this.sasjsConfig.contextName,
-          this.setCsrfTokenApi
-        );
-      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
-        sasApiClient = new SAS9ApiClient(serverUrl);
-      }
-    } else {
-      let sasClientConfig: any = null;
-      if (this.sasjsConfig.serverType === ServerType.SASViya) {
-        sasClientConfig = this.sasViyaApiClient!.getConfig();
-      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
-        sasClientConfig = this.sas9ApiClient!.getConfig();
-      }
-      serverUrl = sasClientConfig.serverUrl;
-      appLoc = sasClientConfig.rootFolderName as string;
-    }
-    const members =
-      serviceJson.members[0].name === "services"
-        ? serviceJson.members[0].members
-        : serviceJson.members;
-    await this.createFoldersAndServices(
-      appLoc,
-      members,
-      accessToken,
-      sasApiClient
-    );
-  }
-
-  private async executeJobViaComputeApi(
-    sasJob: string,
-    data: any,
-    config: any,
+    params?: any,
    loginRequiredCallback?: any,
    accessToken?: string
  ) {
@@ -540,164 +407,55 @@ export default class SASjs {
      },
      SASjob: sasJob,
      data,
+      params,
    };

-    sasjsWaitingRequest.requestPromise.promise = new Promise(
-      async (resolve, reject) => {
-        this.sasViyaApiClient
-          ?.executeComputeJob(
-            sasJob,
-            config.contextName,
-            config.debug,
-            data,
-            accessToken
-          )
-          .then((response) => {
-            if (!config.debug) {
-              this.appendSasjsRequest(null, sasJob, null);
-            } else {
-              this.appendSasjsRequest(response, sasJob, null);
-            }
+    // if (
+    //   this.sasjsConfig.serverType === ServerType.SASViya &&
+    //   this.sasjsConfig.contextName
+    // ) {
+    //   sasjsWaitingRequest.requestPromise.promise = new Promise(
+    //     async (resolve, reject) => {
+    //       const session = await this.checkSession();

-            resolve(JSON.parse(response!.result));
-          })
-          .catch(async (e) => {
-            if (needsRetry(JSON.stringify(e))) {
-              if (this.retryCountComputeApi < requestRetryLimit) {
-                let retryResponse = await this.executeJobViaComputeApi(
-                  sasJob,
-                  data,
-                  config,
-                  loginRequiredCallback,
-                  accessToken
-                );
-
-                this.retryCountComputeApi++;
-
-                resolve(retryResponse);
-              } else {
-                this.retryCountComputeApi = 0;
-                reject({ MESSAGE: "Compute API retry requests limit reached" });
-              }
-            }
-
-            if (e && e.status === 401) {
-              if (loginRequiredCallback) loginRequiredCallback(true);
-              sasjsWaitingRequest.requestPromise.resolve = resolve;
-              sasjsWaitingRequest.requestPromise.reject = reject;
-              sasjsWaitingRequest.config = config;
-              this.sasjsWaitingRequests.push(sasjsWaitingRequest);
-            } else {
-              reject({ MESSAGE: e || "Job execution failed" });
-            }
-          });
-      }
-    );
-    return sasjsWaitingRequest.requestPromise.promise;
-  }
-
-  private async executeJobViaJesApi(
-    sasJob: string,
-    data: any,
-    config: any,
-    loginRequiredCallback?: any,
-    accessToken?: string
-  ) {
-    const sasjsWaitingRequest: SASjsWaitingRequest = {
-      requestPromise: {
-        promise: null,
-        resolve: null,
-        reject: null,
-      },
-      SASjob: sasJob,
-      data,
-    };
-
-    sasjsWaitingRequest.requestPromise.promise = new Promise(
-      async (resolve, reject) => {
-        const session = await this.checkSession();
-
-        if (!session.isLoggedIn) {
-          if (loginRequiredCallback) loginRequiredCallback(true);
-          sasjsWaitingRequest.requestPromise.resolve = resolve;
-          sasjsWaitingRequest.requestPromise.reject = reject;
-          sasjsWaitingRequest.config = config;
-          this.sasjsWaitingRequests.push(sasjsWaitingRequest);
-        } else {
-          resolve(
-            await this.sasViyaApiClient
-              ?.executeJob(
-                sasJob,
-                config.contextName,
-                config.debug,
-                data,
-                accessToken
-              )
-              .then((response) => {
-                if (!config.debug) {
-                  this.appendSasjsRequest(null, sasJob, null);
-                } else {
-                  this.appendSasjsRequest(response, sasJob, null);
-                }
-                return JSON.parse(response!.result);
-              })
-              .catch(async (e) => {
-                if (needsRetry(JSON.stringify(e))) {
-                  if (this.retryCountJeseApi < requestRetryLimit) {
-                    let retryResponse = await this.executeJobViaJesApi(
-                      sasJob,
-                      data,
-                      config,
-                      loginRequiredCallback,
-                      accessToken
-                    );
-
-                    this.retryCountJeseApi++;
-
-                    resolve(retryResponse);
-                  } else {
-                    this.retryCountJeseApi = 0;
-                    reject({ MESSAGE: "Jes API retry requests limit reached" });
-                  }
-                }
-
-                reject({ MESSAGE: (e && e.message) || "Job execution failed" });
-              })
-          );
-        }
-      }
-    );
-    return sasjsWaitingRequest.requestPromise.promise;
-  }
-
-  private async executeJobViaWeb(
-    sasJob: string,
-    data: any,
-    config: any,
-    loginRequiredCallback?: any
-  ) {
-    const sasjsWaitingRequest: SASjsWaitingRequest = {
-      requestPromise: {
-        promise: null,
-        resolve: null,
-        reject: null,
-      },
-      SASjob: sasJob,
-      data,
-    };
-    const program = config.appLoc
-      ? config.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
+    //       if (!session.isLoggedIn) {
+    //         if (loginRequiredCallback) loginRequiredCallback(true);
+    //         logInRequired = true;
+    //         sasjsWaitingRequest.requestPromise.resolve = resolve;
+    //         sasjsWaitingRequest.requestPromise.reject = reject;
+    //         this.sasjsWaitingRequests.push(sasjsWaitingRequest);
+    //       } else {
+    //         resolve(
+    //           await this.sasViyaApiClient?.executeJob(
+    //             sasJob,
+    //             this.sasjsConfig.contextName,
+    //             this.sasjsConfig.debug,
+    //             data,
+    //             accessToken
+    //           )
+    //         );
+    //       }
+    //     }
+    //   );
+    //   return sasjsWaitingRequest.requestPromise.promise;
+    // } else {
+    const program = this.sasjsConfig.appLoc
+      ? this.sasjsConfig.appLoc.replace(/\/?$/, "/") + sasJob.replace(/^\//, "")
      : sasJob;
    const jobUri =
-      config.serverType === "SASVIYA" ? await this.getJobUri(sasJob) : "";
-    const apiUrl = `${config.serverUrl}${this.jobsPath}/?${
+      this.sasjsConfig.serverType === "SASVIYA"
+        ? await this.getJobUri(sasJob)
+        : "";
+    const apiUrl = `${this.sasjsConfig.serverUrl}${this.jobsPath}/?${
      jobUri.length > 0
        ? "__program=" + program + "&_job=" + jobUri
        : "_program=" + program
    }`;

+    const inputParams = params ? params : {};
    const requestParams = {
-      ...this.getRequestParamsWeb(),
+      ...inputParams,
+      ...this.getRequestParams(),
    };

    const formData = new FormData();
@@ -706,68 +464,74 @@ export default class SASjs {
    let errorMsg = "";

    if (data) {
+      console.log("Input data", data);
      const stringifiedData = JSON.stringify(data);
      if (
-        config.serverType === ServerType.SAS9 ||
+        this.sasjsConfig.serverType === ServerType.SAS9 ||
        stringifiedData.length > 500000 ||
        stringifiedData.includes(";")
      ) {
        // file upload approach
        for (const tableName in data) {
+          console.log("TableName: ", tableName);
          if (isError) {
            return;
          }
          const name = tableName;
          const csv = convertToCSV(data[tableName]);
+          console.log("Converted CSV", csv);
          if (csv === "ERROR: LARGE STRING LENGTH") {
+            console.log("String too long");
            isError = true;
            errorMsg =
              "The max length of a string value in SASjs is 32765 characters.";
          }

-          const file = new Blob([csv], {
-            type: "application/csv",
-          });
+          const file = new Blob([csv], { type: "application/csv" });
+          console.log("File", file);

          formData.append(name, file, `${name}.csv`);
        }
-      } else {
-        // param based approach
-        const sasjsTables = [];
-        let tableCounter = 0;
-        for (const tableName in data) {
-          if (isError) {
-            return;
-          }
-          tableCounter++;
-          sasjsTables.push(tableName);
-          const csv = convertToCSV(data[tableName]);
-          if (csv === "ERROR: LARGE STRING LENGTH") {
-            isError = true;
-            errorMsg =
-              "The max length of a string value in SASjs is 32765 characters.";
-          }
-          // if csv has length more then 16k, send in chunks
-          if (csv.length > 16000) {
-            const csvChunks = splitChunks(csv);
-            // append chunks to form data with same key
-            csvChunks.map((chunk) => {
-              formData.append(`sasjs${tableCounter}data`, chunk);
-            });
-          } else {
-            requestParams[`sasjs${tableCounter}data`] = csv;
-          }
-        }
-        requestParams["sasjs_tables"] = sasjsTables.join(" ");
      }
+      // param based approach
+      const sasjsTables = [];
+      let tableCounter = 0;
+      for (const tableName in data) {
+        if (isError) {
+          return;
+        }
+        tableCounter++;
+        sasjsTables.push(tableName);
+        const csv = convertToCSV(data[tableName]);
+        if (csv === "ERROR: LARGE STRING LENGTH") {
+          isError = true;
+          errorMsg =
+            "The max length of a string value in SASjs is 32765 characters.";
+        }
+        // if csv has length more then 16k, send in chunks
+        if (csv.length > 16000) {
+          const csvChunks = splitChunks(csv);
+          // append chunks to form data with same key
+          csvChunks.map((chunk) => {
+            formData.append(`sasjs${tableCounter}data`, chunk);
+          });
+        } else {
+          requestParams[`sasjs${tableCounter}data`] = csv;
+        }
+      }
+      requestParams["sasjs_tables"] = sasjsTables.join(" ");
    }

+    console.log("Request params", requestParams);
+
    for (const key in requestParams) {
      if (requestParams.hasOwnProperty(key)) {
        formData.append(key, requestParams[key]);
      }
    }

+    console.log("Form data", formData);
+
    let isRedirected = false;

    sasjsWaitingRequest.requestPromise.promise = new Promise(
@@ -775,9 +539,11 @@ export default class SASjs {
        if (isError) {
          reject({ MESSAGE: errorMsg });
        }
-        const headers: any = {};
-        if (this.csrfTokenWeb) {
-          headers[this.csrfTokenWeb.headerName] = this.csrfTokenWeb.value;
+        const headers: any = {
+          "Content-Type": "application/x-www-form-urlencoded",
+        };
+        if (this._csrfHeader && this._csrf) {
+          headers[this._csrfHeader] = this._csrf;
        }
        fetch(apiUrl, {
          method: "POST",
@@ -792,15 +558,16 @@ export default class SASjs {

                if (tokenHeader) {
                  const token = response.headers.get(tokenHeader);
-                  this.csrfTokenWeb = {
-                    headerName: tokenHeader,
-                    value: token || "",
-                  };
+                  this._csrfHeader = tokenHeader;
+                  this._csrf = token;
                }
              }
            }

-            if (response.redirected && config.serverType === ServerType.SAS9) {
+            if (
+              response.redirected &&
+              this.sasjsConfig.serverType === ServerType.SAS9
+            ) {
              isRedirected = true;
            }

@@ -811,28 +578,30 @@ export default class SASjs {
              (needsRetry(responseText) || isRedirected) &&
              !isLogInRequired(responseText)
            ) {
-              if (this.retryCountWeb < requestRetryLimit) {
-                this.retryCountWeb++;
-                this.request(sasJob, data).then(
+              if (this.retryCount < requestRetryLimit) {
+                this.retryCount++;
+                this.request(sasJob, data, params).then(
                  (res: any) => resolve(res),
                  (err: any) => reject(err)
                );
              } else {
-                this.retryCountWeb = 0;
+                this.retryCount = 0;
                reject(responseText);
              }
            } else {
-              this.retryCountWeb = 0;
+              this.retryCount = 0;
              this.parseLogFromResponse(responseText, program);

              if (isLogInRequired(responseText)) {
                if (loginRequiredCallback) loginRequiredCallback(true);
                sasjsWaitingRequest.requestPromise.resolve = resolve;
                sasjsWaitingRequest.requestPromise.reject = reject;
-                sasjsWaitingRequest.config = config;
                this.sasjsWaitingRequests.push(sasjsWaitingRequest);
              } else {
-                if (config.serverType === ServerType.SAS9 && config.debug) {
+                if (
+                  this.sasjsConfig.serverType === ServerType.SAS9 &&
+                  this.sasjsConfig.debug
+                ) {
                  this.updateUsername(responseText);
                  const jsonResponseText = this.parseSAS9Response(responseText);

@@ -844,8 +613,8 @@ export default class SASjs {
                    });
                  }
                } else if (
-                  config.serverType === ServerType.SASViya &&
-                  config.debug
+                  this.sasjsConfig.serverType === ServerType.SASViya &&
+                  this.sasjsConfig.debug
                ) {
                  try {
                    this.parseSASVIYADebugResponse(responseText).then(
@@ -883,15 +652,72 @@ export default class SASjs {
    );

    return sasjsWaitingRequest.requestPromise.promise;
+    // }
  }

-  private setCsrfTokenApi = (csrfToken: CsrfToken) => {
-    this.csrfTokenApi = csrfToken;
-  };
+  /**
+   * Creates the folders and services in the provided JSON on the given location
+   * (appLoc) on the given server (serverUrl).
+   * @param serviceJson - the JSON specifying the folders and services to be created.
+   * @param appLoc - the base folder in which to create the new folders and
+   * services.  If not provided, is taken from SASjsConfig.
+   * @param serverUrl - the server on which to deploy the folders and services.
+   * If not provided, is taken from SASjsConfig.
+   * @param accessToken - an optional access token to be passed in when
+   * using this function from the command line.
+   */
+  public async deployServicePack(
+    serviceJson: any,
+    appLoc?: string,
+    serverUrl?: string,
+    accessToken?: string
+  ) {
+    if (this.sasjsConfig.serverType !== ServerType.SASViya) {
+      throw new Error("This operation is only supported on SAS Viya servers.");
+    }
+
+    let sasApiClient: any = null;
+    if (serverUrl || appLoc) {
+      if (!serverUrl) {
+        serverUrl = this.sasjsConfig.serverUrl;
+      }
+      if (!appLoc) {
+        appLoc = this.sasjsConfig.appLoc;
+      }
+      if (this.sasjsConfig.serverType === ServerType.SASViya) {
+        sasApiClient = new SASViyaApiClient(serverUrl, appLoc);
+      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
+        sasApiClient = new SAS9ApiClient(serverUrl);
+      }
+    } else {
+      let sasClientConfig: any = null;
+      if (this.sasjsConfig.serverType === ServerType.SASViya) {
+        sasClientConfig = this.sasViyaApiClient!.getConfig();
+      } else if (this.sasjsConfig.serverType === ServerType.SAS9) {
+        sasClientConfig = this.sas9ApiClient!.getConfig();
+      }
+      serverUrl = sasClientConfig.serverUrl;
+      appLoc = sasClientConfig.rootFolderName as string;
+    }
+    const members =
+      serviceJson.members[0].name === "services"
+        ? serviceJson.members[0].members
+        : serviceJson.members;
+    await this.createFoldersAndServices(
+      appLoc,
+      members,
+      accessToken,
+      sasApiClient
+    );
+  }

  private async resendWaitingRequests() {
    for (const sasjsWaitingRequest of this.sasjsWaitingRequests) {
-      this.request(sasjsWaitingRequest.SASjob, sasjsWaitingRequest.data).then(
+      this.request(
+        sasjsWaitingRequest.SASjob,
+        sasjsWaitingRequest.data,
+        sasjsWaitingRequest.params
+      ).then(
        (res: any) => {
          sasjsWaitingRequest.requestPromise.resolve(res);
        },
@@ -904,12 +730,12 @@ export default class SASjs {
    this.sasjsWaitingRequests = [];
  }

-  private getRequestParamsWeb(): any {
+  private getRequestParams(): any {
    const requestParams: any = {};

-    if (this.csrfTokenWeb) {
-      requestParams["_csrf"] = this.csrfTokenWeb.value;
-    }
+    // if (this._csrf) {
+    //   requestParams["_csrf"] = this._csrf;
+    // }

    if (this.sasjsConfig.debug) {
      requestParams["_omittextlog"] = "false";
@@ -1026,6 +852,7 @@ export default class SASjs {
    }
  }

+  // FIXME: this method never used
  private fetchLogFileContent(logLink: string) {
    return new Promise((resolve, reject) => {
      fetch(logLink, {
@@ -1046,20 +873,14 @@ export default class SASjs {
    let generatedCode = "";
    let sasWork = null;

-    if (response && response.result && response.log) {
-      sourceCode = parseSourceCode(response.log);
-      generatedCode = parseGeneratedCode(response.log);
-      sasWork = JSON.parse(response.result).WORK;
-    } else {
-      if (response) {
-        sourceCode = parseSourceCode(response);
-        generatedCode = parseGeneratedCode(response);
-        sasWork = await this.parseSasWork(response);
-      }
+    if (response) {
+      sourceCode = parseSourceCode(response);
+      generatedCode = parseGeneratedCode(response);
+      sasWork = await this.parseSasWork(response);
    }

    this.sasjsRequests.push({
-      logFile: (response && response.log) || response,
+      logFile: response,
      serviceLink: program,
      timestamp: new Date(),
      sourceCode,
@@ -1080,7 +901,7 @@ export default class SASjs {
        try {
          jsonResponse = JSON.parse(this.parseSAS9Response(response));
        } catch (e) {
-          console.error(e);
+          console.log(e);
        }
      } else {
        await this.parseSASVIYADebugResponse(response).then(
@@ -1088,11 +909,11 @@ export default class SASjs {
            try {
              jsonResponse = JSON.parse(resText);
            } catch (e) {
-              console.error(e);
+              console.log(e);
            }
          },
          (err: any) => {
-            console.error(err);
+            console.log(err);
          }
        );
      }
@@ -1144,9 +965,7 @@ export default class SASjs {
      else
        this.sasViyaApiClient = new SASViyaApiClient(
          this.sasjsConfig.serverUrl,
-          this.sasjsConfig.appLoc,
-          this.sasjsConfig.contextName,
-          this.setCsrfTokenApi
+          this.sasjsConfig.appLoc
        );
    }
    if (this.sasjsConfig.serverType === ServerType.SAS9) {
@@ -1154,12 +973,6 @@ export default class SASjs {
        this.sas9ApiClient!.setConfig(this.sasjsConfig.serverUrl);
      else this.sas9ApiClient = new SAS9ApiClient(this.sasjsConfig.serverUrl);
    }
-
-    this.fileUploader = new FileUploader(
-      this.sasjsConfig.appLoc,
-      this.sasjsConfig.serverUrl,
-      this.jobsPath
-    );
  }

  private setLoginUrl = (matches: RegExpExecArray) => {
@@ -1239,4 +1052,4 @@ export default class SASjs {
        );
    });
  }
-}
+}
--- a/src/SessionManager.ts
+++ b/src/SessionManager.ts
@@ -1,160 +0,0 @@
-import { Session, Context, CsrfToken } from "./types";
-import { asyncForEach, makeRequest } from "./utils";
-
-const MAX_SESSION_COUNT = 1;
-
-export class SessionManager {
-  constructor(
-    private serverUrl: string,
-    private contextName: string,
-    private setCsrfToken: (csrfToken: CsrfToken) => void
-  ) {}
-  private sessions: Session[] = [];
-  private currentContext: Context | null = null;
-  private csrfToken: CsrfToken | null = null;
-
-  async getSession(accessToken?: string) {
-    await this.createSessions(accessToken);
-    this.createAndWaitForSession(accessToken);
-    const session = this.sessions.pop();
-    return session;
-  }
-
-  async clearSession(id: string, accessToken?: string) {
-    const deleteSessionRequest = {
-      method: "DELETE",
-      headers: this.getHeaders(accessToken),
-    };
-    return await this.request<Session>(
-      `${this.serverUrl}/compute/sessions/${id}`,
-      deleteSessionRequest
-    ).then(() => {
-      this.sessions = this.sessions.filter((s) => s.id !== id);
-    });
-  }
-
-  private async createSessions(accessToken?: string) {
-    if (!this.sessions.length) {
-      if (!this.currentContext) {
-        await this.setCurrentContext(accessToken);
-      }
-      await asyncForEach(new Array(MAX_SESSION_COUNT), async () => {
-        const createdSession = await this.createAndWaitForSession(accessToken);
-        this.sessions.push(createdSession);
-      });
-    }
-  }
-
-  private async createAndWaitForSession(accessToken?: string) {
-    const createSessionRequest = {
-      method: "POST",
-      headers: this.getHeaders(accessToken),
-    };
-    const { result: createdSession, etag } = await this.request<Session>(
-      `${this.serverUrl}/compute/contexts/${this.currentContext!.id}/sessions`,
-      createSessionRequest
-    );
-
-    await this.waitForSession(createdSession, etag);
-    this.sessions.push(createdSession);
-    return createdSession;
-  }
-
-  private async setCurrentContext(accessToken?: string) {
-    if (!this.currentContext) {
-      const { result: contexts } = await this.request<{
-        items: Context[];
-      }>(`${this.serverUrl}/compute/contexts`, {
-        headers: this.getHeaders(accessToken),
-      });
-
-      const contextsList =
-        contexts && contexts.items && contexts.items.length
-          ? contexts.items
-          : [];
-
-      const currentContext = contextsList.find(
-        (c: any) => c.name === this.contextName
-      );
-
-      if (!currentContext) {
-        throw new Error(
-          `The context ${this.contextName} was not found on the server ${this.serverUrl}`
-        );
-      }
-
-      this.currentContext = currentContext;
-    }
-  }
-
-  private getHeaders(accessToken?: string) {
-    const headers: any = {
-      "Content-Type": "application/json",
-    };
-    if (accessToken) {
-      headers.Authorization = `Bearer ${accessToken}`;
-    }
-
-    return headers;
-  }
-
-  private async waitForSession(
-    session: Session,
-    etag: string | null,
-    accessToken?: string,
-    silent = false
-  ) {
-    let sessionState = session.state;
-    const headers: any = {
-      ...this.getHeaders(accessToken),
-      "If-None-Match": etag,
-    };
-    const stateLink = session.links.find((l: any) => l.rel === "state");
-    return new Promise(async (resolve, _) => {
-      if (sessionState === "pending") {
-        if (stateLink) {
-          if (!silent) {
-            console.log("Polling session status... \n");
-          }
-          const { result: state } = await this.request<string>(
-            `${this.serverUrl}${stateLink.href}?wait=30`,
-            {
-              headers,
-            },
-            "text"
-          );
-
-          sessionState = state.trim();
-          if (!silent) {
-            console.log(`Current state: ${sessionState}\n`);
-          }
-          resolve(sessionState);
-        }
-      } else {
-        resolve(sessionState);
-      }
-    });
-  }
-
-  private async request<T>(
-    url: string,
-    options: RequestInit,
-    contentType: "text" | "json" = "json"
-  ) {
-    if (this.csrfToken) {
-      options.headers = {
-        ...options.headers,
-        [this.csrfToken.headerName]: this.csrfToken.value,
-      };
-    }
-    return await makeRequest<T>(
-      url,
-      options,
-      (token) => {
-        this.csrfToken = token;
-        this.setCsrfToken(token);
-      },
-      contentType
-    );
-  }
-}
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,5 +1,7 @@
-import SASjs from "./SASjs";
-export * from "./types";
-export * from "./SASViyaApiClient";
-export * from "./SAS9ApiClient";
-export default SASjs;
+import SASjs from './SASjs'
+
+export * from './types'
+export * from './SASViyaApiClient'
+export * from './SAS9ApiClient'
+
+export default SASjs
--- a/src/types/Context.ts
+++ b/src/types/Context.ts
@@ -3,4 +3,4 @@ export interface Context {
  id: string;
  createdBy: string;
  version: number;
-}
+}
--- a/src/types/CsrfToken.ts
+++ b/src/types/CsrfToken.ts
@@ -1,4 +1,4 @@
 export interface CsrfToken {
  headerName: string;
  value: string;
-}
+}
--- a/src/types/Folder.ts
+++ b/src/types/Folder.ts
@@ -4,4 +4,4 @@ export interface Folder {
  id: string;
  uri: string;
  links: Link[];
-}
+}
--- a/src/types/Job.ts
+++ b/src/types/Job.ts
@@ -8,5 +8,4 @@ export interface Job {
  createdBy: string;
  links: Link[];
  results: JobResult;
-  error?: any;
-}
+}
--- a/src/types/JobDefinition.ts
+++ b/src/types/JobDefinition.ts
@@ -1,3 +0,0 @@
-export interface JobDefinition {
-  code: string;
-}
--- a/src/types/JobResult.ts
+++ b/src/types/JobResult.ts
@@ -1,3 +1,3 @@
 export interface JobResult {
  "_webout.json": string;
-}
+}
--- a/src/types/Link.ts
+++ b/src/types/Link.ts
@@ -4,4 +4,4 @@ export interface Link {
  href: string;
  uri: string;
  type: string;
-}
+}
--- a/src/types/SASjsConfig.ts
+++ b/src/types/SASjsConfig.ts
@@ -10,6 +10,7 @@ export class SASjsConfig {
   * Can be omitted, eg if serving directly from the SAS Web Server or being
   * streamed.
   */
+  // TODO: we should clarify what location we are talking about
  serverUrl: string = "";
  pathSAS9: string = "";
  pathSASViya: string = "";
@@ -27,5 +28,4 @@ export class SASjsConfig {
   */
  debug: boolean = true;
  contextName: string = "";
-  useComputeApi = false;
 }
--- a/src/types/SASjsRequest.ts
+++ b/src/types/SASjsRequest.ts
@@ -9,4 +9,4 @@ export interface SASjsRequest {
  generatedCode: string;
  logFile: string;
  SASWORK: any;
-}
+}
--- a/src/types/SASjsWaitingRequest.ts
+++ b/src/types/SASjsWaitingRequest.ts
@@ -2,6 +2,8 @@
 * Represents requests that are queued, pending a signon event
 *
 */
+
+ // FIXME: be more specific on type declaration
 export interface SASjsWaitingRequest {
  requestPromise: {
    promise: any;
@@ -10,5 +12,5 @@ export interface SASjsWaitingRequest {
  };
  SASjob: string;
  data: any;
-  config?: any;
+  params?: any;
 }
--- a/src/types/ServerType.ts
+++ b/src/types/ServerType.ts
@@ -5,4 +5,4 @@
 export enum ServerType {
  SASViya = "SASVIYA",
  SAS9 = "SAS9",
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yury Shkoda	9598c11f42	Added suggestions	2020-07-16 15:02:40 -04:00
Yury Shkoda	334a849caa	Added suggestions	2020-07-16 15:02:17 -04:00