diff --git a/functions/postwomanTesting.js b/functions/postwomanTesting.js
index d5311b729..c9a9ffe53 100644
--- a/functions/postwomanTesting.js
+++ b/functions/postwomanTesting.js
@@ -1,11 +1,14 @@
 import {parse} from "graphql";
+const PASS = 'PASS',
+  FAIL = 'FAIL',
+  ERROR = 'ERROR';
 
 export default function runTestScriptWitVariables(script, variables) {
-
   let pw = {
     _errors: [],
+    _testResults: [],
     _report: '',
-    expect,
+    expect: function(value) { return expect(value, this._testResults) },
     test
     // globals that the script is allowed to have access to.
   };
@@ -17,9 +20,10 @@ export default function runTestScriptWitVariables(script, variables) {
     new Function("pw", script)(pw);
   }
   catch (e) {
+    debugger;
     errors = e;
   }
-  return errors;
+  return {report: pw._report, errors: pw._errors, testResults: pw._testResults};
 }
 
 function test(descriptor, func) {
@@ -29,6 +33,7 @@ function test(descriptor, func) {
     testReports.push({descriptor: true, message: descriptor});
     func();
   };
+  //TODO shadow pw object to override _testReports
   let xit = (descriptor, func) => {
     testReports.push({descriptor: true, message: `⊖ ${descriptor} [skipped]`})
   };
@@ -39,8 +44,8 @@ function test(descriptor, func) {
   // add checkmark or x depending on if each testReport is pass=true or pass=false
 }
 
-function expect(expectValue) {
-  return new Expectation(expectValue);
+function expect(expectValue, _testReports) {
+  return new Expectation(expectValue, null, _testReports);
 }
 
 class Expectation {
@@ -73,18 +78,10 @@ class Expectation {
     }
   }
   _fail(message) {
-    if (this._testReports) {
-      this._testReports.push({pass: false, message})
-    } else {
-      throw {message}
-    }
+    this._testReports.push({result: FAIL, message})
   }
   _pass(message) {
-    if (this._testReports) {
-      this._testReports.push({pass: true, message});
-    } else {
-      return true;
-    }
+    this._testReports.push({result: PASS});
   }
   // TEST METHODS DEFINED BELOW
   // these are the usual methods that would follow expect(...)
diff --git a/pages/index.vue b/pages/index.vue
index cc4a8cce1..4b486afce 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -359,7 +359,7 @@
                 </div>
               </div>
               <Editor
-                v-model="postRequestTests"
+                v-model="testScript"
                 :lang="'javascript'"
                 :options="{
                   maxLines: responseBodyMaxLines,
@@ -1190,6 +1190,7 @@
   import textareaAutoHeight from "../directives/textareaAutoHeight";
   import parseCurlCommand from "../assets/js/curlparser.js";
   import getEnvironmentVariablesFromScript from "../functions/preRequest";
+  import runTestScriptWitVariables from '../functions/postWomanTesting';
   import parseTemplateString from "../functions/templating";
   import AceEditor from "../components/ace-editor";
   import {tokenRequest, oauthRedirect} from "../assets/js/oauth";
@@ -1266,7 +1267,7 @@
         showPreRequestScript: false,
         testsEnabled: false,
         preRequestScript: "// pw.env.set('variable', 'value');",
-        postRequestTests: "// pw.expect('variable').toBe('value);",
+        testScript: "// pw.expect('variable').toBe('value');",
         copyButton: '<i class="material-icons">file_copy</i>',
         downloadButton: '<i class="material-icons">get_app</i>',
         doneButton: '<i class="material-icons">done</i>',
@@ -2141,6 +2142,9 @@
             icon: "done"
           });
 
+          // tests
+          const testResults = runTestScriptWitVariables(this.testScript, {});
+
           (() => {
             const status = (this.response.status = payload.status);
             const headers = (this.response.headers = payload.headers);
@@ -2184,7 +2188,8 @@
               url: this.url,
               path: this.path,
               usesScripts: Boolean(this.preRequestScript),
-              preRequestScript: this.preRequestScript
+              preRequestScript: this.preRequestScript,
+              testCode: this.testCode
             };
             this.$refs.historyComponent.addEntry(entry);
             return;