diff --git a/cypress/e2e/context_and_state.ts b/cypress/e2e/context_and_state.ts
index 84bd7e4a7..3813fcd28 100644
--- a/cypress/e2e/context_and_state.ts
+++ b/cypress/e2e/context_and_state.ts
@@ -233,7 +233,7 @@ describe('Kendraio context and state', () => {
     loadFlowCode([
       {
         "type": "context-save",
-        "valueGetter": "`true`",
+        "valueGetter": "`false`",
         "contextKey": "state.global.disabled",
       },
       {
diff --git a/package.json b/package.json
index 4e33ad031..9acd329c3 100644
--- a/package.json
+++ b/package.json
@@ -16,10 +16,10 @@
     "//comment1": "NB: Dynamic index html generation (SSO)",
     "//comment2": "Before deploy, do prod build, and move index.html to functions folder",
     "deploy": "mv dist/index.html functions/ && firebase deploy --only functions,hosting",
-    "e2e:serve_and_retest_on_change": "xvfb-maybe start-server-and-test serve:dev http://localhost:4200 'npm run e2e:retest_on_change'",
-    "e2e:retest_on_change": "xvfb-maybe nodemon -e js,jsx,ts,tsx,css,scss --exec 'ng test -- --watch=false; cypress run --headed --no-exit'",
-    "e2e:autorun": "xvfb-maybe ng test -- --watch=false; xvfb-maybe cypress run --headed",
-    "e2e:serve_and_test": "npx cypress install; xvfb-maybe start-server-and-test serve:dev http://localhost:4200 'ng test -- --watch=false; cypress run'",
+    "test:serve_and_retest_on_change": "xvfb-maybe start-server-and-test serve:dev http://localhost:4200 'npm run test:retest_on_change'",
+    "test:retest_on_change": "xvfb-maybe nodemon -e js,jsx,ts,tsx,css,scss --exec 'ng test --watch=false; cypress open --config watchForFileChanges=true'",
+    "test:autorun": "xvfb-maybe ng test --watch=false; xvfb-maybe cypress run --headed",
+    "test:serve_and_test": "npx cypress install; xvfb-maybe start-server-and-test serve:dev http://localhost:4200 'ng test --watch=false; cypress run'",
     "lint": "ng lint"
   },
   "private": true,