diff --git a/package-lock.json b/package-lock.json
index 15fc177d2..7227f0694 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -52,7 +52,7 @@
     },
     "@babel/generator": {
       "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2fgenerator/-/generator-7.9.4.tgz",
       "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==",
       "dev": true,
       "requires": {
@@ -101,7 +101,7 @@
     },
     "@babel/helper-validator-identifier": {
       "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2fhelper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
       "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
       "dev": true
     },
@@ -149,7 +149,7 @@
     },
     "@babel/parser": {
       "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2fparser/-/parser-7.9.4.tgz",
       "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
       "dev": true
     },
@@ -164,7 +164,7 @@
     },
     "@babel/template": {
       "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2ftemplate/-/template-7.8.6.tgz",
       "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
       "dev": true,
       "requires": {
@@ -175,7 +175,7 @@
     },
     "@babel/traverse": {
       "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2ftraverse/-/traverse-7.9.0.tgz",
       "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
       "dev": true,
       "requires": {
@@ -209,7 +209,7 @@
     },
     "@babel/types": {
       "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/@babel%2ftypes/-/types-7.9.0.tgz",
       "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
       "dev": true,
       "requires": {
@@ -948,7 +948,7 @@
     },
     "@types/color-name": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/@types%2fcolor-name/-/color-name-1.1.1.tgz",
       "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
     },
     "@types/long": {
@@ -1012,7 +1012,7 @@
     },
     "acorn": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/acorn/-/acorn-7.1.1.tgz",
       "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
       "dev": true
     },
@@ -1087,7 +1087,7 @@
     },
     "ansi-colors": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "resolved": "http://npm.zooz.co:8083/ansi-colors/-/ansi-colors-3.2.3.tgz",
       "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
       "dev": true
     },
@@ -1130,7 +1130,7 @@
     },
     "anymatch": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/anymatch/-/anymatch-3.1.1.tgz",
       "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
@@ -1140,7 +1140,7 @@
       "dependencies": {
         "normalize-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "resolved": "http://npm.zooz.co:8083/normalize-path/-/normalize-path-3.0.0.tgz",
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         }
@@ -1635,7 +1635,7 @@
     },
     "binary-extensions": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/binary-extensions/-/binary-extensions-2.0.0.tgz",
       "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
       "dev": true
     },
@@ -1783,7 +1783,7 @@
     },
     "braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "resolved": "http://npm.zooz.co:8083/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "requires": {
@@ -1846,7 +1846,7 @@
     },
     "bunyan": {
       "version": "1.8.12",
-      "resolved": "https://registry.npmjs.org/bunyan/-/bunyan-1.8.12.tgz",
+      "resolved": "http://npm.zooz.co:8083/bunyan/-/bunyan-1.8.12.tgz",
       "integrity": "sha1-8VDw9nSKvdcq6uhPBEA74u8RN5c=",
       "requires": {
         "dtrace-provider": "~0.8",
@@ -2097,7 +2097,7 @@
     },
     "chokidar": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/chokidar/-/chokidar-3.3.0.tgz",
       "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==",
       "dev": true,
       "requires": {
@@ -2113,13 +2113,13 @@
       "dependencies": {
         "is-extglob": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "resolved": "http://npm.zooz.co:8083/is-extglob/-/is-extglob-2.1.1.tgz",
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
           "dev": true
         },
         "is-glob": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "resolved": "http://npm.zooz.co:8083/is-glob/-/is-glob-4.0.1.tgz",
           "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
           "requires": {
@@ -2128,7 +2128,7 @@
         },
         "normalize-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "resolved": "http://npm.zooz.co:8083/normalize-path/-/normalize-path-3.0.0.tgz",
           "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         }
@@ -5129,7 +5129,7 @@
     },
     "fill-range": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
@@ -5454,7 +5454,7 @@
     },
     "fsevents": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+      "resolved": "http://npm.zooz.co:8083/fsevents/-/fsevents-2.1.2.tgz",
       "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
       "dev": true,
       "optional": true
@@ -6121,7 +6121,7 @@
     },
     "he": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/he/-/he-1.2.0.tgz",
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
@@ -6580,7 +6580,7 @@
     },
     "is-binary-path": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
@@ -6673,7 +6673,7 @@
     },
     "is-finite": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/is-finite/-/is-finite-1.1.0.tgz",
       "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
       "dev": true
     },
@@ -6714,7 +6714,7 @@
     },
     "is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
@@ -7175,7 +7175,7 @@
     },
     "kind-of": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "resolved": "http://npm.zooz.co:8083/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "latest-version": {
@@ -7745,7 +7745,7 @@
     },
     "minimist": {
       "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "http://npm.zooz.co:8083/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minimist-options": {
@@ -7827,7 +7827,7 @@
     },
     "mocha": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/mocha/-/mocha-7.1.1.tgz",
       "integrity": "sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==",
       "dev": true,
       "requires": {
@@ -7859,7 +7859,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "resolved": "http://npm.zooz.co:8083/ansi-styles/-/ansi-styles-3.2.1.tgz",
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "dev": true,
           "requires": {
@@ -7868,7 +7868,7 @@
         },
         "chalk": {
           "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "resolved": "http://npm.zooz.co:8083/chalk/-/chalk-2.4.2.tgz",
           "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "dev": true,
           "requires": {
@@ -7879,7 +7879,7 @@
           "dependencies": {
             "supports-color": {
               "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "resolved": "http://npm.zooz.co:8083/supports-color/-/supports-color-5.5.0.tgz",
               "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
               "dev": true,
               "requires": {
@@ -7890,7 +7890,7 @@
         },
         "debug": {
           "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "resolved": "http://npm.zooz.co:8083/debug/-/debug-3.2.6.tgz",
           "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "dev": true,
           "requires": {
@@ -7899,7 +7899,7 @@
         },
         "glob": {
           "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "resolved": "http://npm.zooz.co:8083/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "requires": {
@@ -7913,7 +7913,7 @@
         },
         "log-symbols": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+          "resolved": "http://npm.zooz.co:8083/log-symbols/-/log-symbols-3.0.0.tgz",
           "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
           "dev": true,
           "requires": {
@@ -7922,7 +7922,7 @@
         },
         "mkdirp": {
           "version": "0.5.3",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
+          "resolved": "http://npm.zooz.co:8083/mkdirp/-/mkdirp-0.5.3.tgz",
           "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
           "dev": true,
           "requires": {
@@ -7931,13 +7931,13 @@
         },
         "ms": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "resolved": "http://npm.zooz.co:8083/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
         },
         "supports-color": {
           "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+          "resolved": "http://npm.zooz.co:8083/supports-color/-/supports-color-6.0.0.tgz",
           "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
           "dev": true,
           "requires": {
@@ -8356,7 +8356,7 @@
     },
     "node-environment-flags": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
+      "resolved": "http://npm.zooz.co:8083/node-environment-flags/-/node-environment-flags-1.0.6.tgz",
       "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==",
       "dev": true,
       "requires": {
@@ -8668,7 +8668,7 @@
     },
     "object.getownpropertydescriptors": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
       "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
       "dev": true,
       "requires": {
@@ -9068,7 +9068,7 @@
     },
     "picomatch": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "resolved": "http://npm.zooz.co:8083/picomatch/-/picomatch-2.2.2.tgz",
       "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
@@ -9468,7 +9468,7 @@
     },
     "readdirp": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/readdirp/-/readdirp-3.2.0.tgz",
       "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
       "dev": true,
       "requires": {
@@ -9896,7 +9896,7 @@
     },
     "rewire": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/rewire/-/rewire-5.0.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/rewire/-/rewire-5.0.0.tgz",
       "integrity": "sha512-1zfitNyp9RH5UDyGGLe9/1N0bMlPQ0WrX0Tmg11kMHBpqwPJI4gfPpP7YngFyLbFmhXh19SToAG0sKKEFcOIJA==",
       "dev": true,
       "requires": {
@@ -11534,7 +11534,7 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "resolved": "http://npm.zooz.co:8083/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
@@ -12133,7 +12133,7 @@
     },
     "yargs-unparser": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "resolved": "http://npm.zooz.co:8083/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
       "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
       "dev": true,
       "requires": {
diff --git a/ui/src/features/components/TestForm/index.js b/ui/src/features/components/TestForm/index.js
index e9caef200..60f491b65 100644
--- a/ui/src/features/components/TestForm/index.js
+++ b/ui/src/features/components/TestForm/index.js
@@ -31,7 +31,7 @@ export class TestForm extends React.Component {
     constructor(props) {
         super(props);
         if (props.data) {
-            this.state = createStateForEditTest(props.data);
+            this.state = createStateForEditTest(props.data, props.cloneMode);
         } else {
             this.state = {
                 scenarios: [],
@@ -92,7 +92,7 @@ export class TestForm extends React.Component {
     componentDidMount() {
         this.props.getProcessors({exclude: 'javascript'});
         this.props.initForm();
-        if (this.state.editMode) {
+        if (this.state.editMode || this.props.cloneMode) {
 
             if (this.props.data.csv_file_id) {
                 this.props.getFileMetadata(this.props.data.csv_file_id);
@@ -106,7 +106,6 @@ export class TestForm extends React.Component {
             }
         } else {
             this.addScenarioHandler();
-
         }
     }
 
@@ -116,51 +115,51 @@ export class TestForm extends React.Component {
         const error = createTestError || processorsError || maxSupportedScenariosUi;
         return (
             <Modal style={{paddingTop: '65px'}} height={'93%'} onExit={closeDialog}>
-            <FormWrapper title={`${editMode && 'Edit' || 'Create'} Test`}>
-    <div className={style['top']}>
-            <div className={style['top-inputs']}>
-            {/* left */}
-
-            <div className={style['input-container']}>
-            <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Name'}>
-            <TextArea maxRows={5} value={name} onChange={(evt, value) => {
-            this.setState({name: evt.target.value})
-        }}/>
-        </TitleInput>
-        </div>
-        <div className={style['input-container']}>
-            <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Description'}>
-            <TextArea maxRows={5} value={description} onChange={(evt, value) => {
-            this.setState({description: evt.target.value})
-        }}/>
-        </TitleInput>
-        </div>
-        <div className={style['input-container']}>
-            <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Base url'}>
-            <TextArea maxRows={5} value={baseUrl} placeholder={'http://my.api.com/'}
-        onChange={(evt, value) => {
-            this.setState({baseUrl: evt.target.value})
-        }}/>
-        </TitleInput>
-        </div>
-
-        <div className={style['input-container']}>
-            <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Processor'}>
-            <ProcessorsDropDown
-        onChange={this.onProcessorChosen} options={processorsList} value={processorId}
-        loading={processorsLoading}/>
-        </TitleInput>
-
-        </div>
-        </div>
-        </div>
-        {/* bottom */}
-
-        {this.generateScenarioDashBoard()}
-        {this.generateBottomBar()}
-        {error && <ErrorDialog closeDialog={this.onCloseErrorDialog} showMessage={error}/>}
-        </FormWrapper>
-        </Modal>
+                <FormWrapper title={`${editMode && 'Edit' || 'Create'} Test`}>
+                    <div className={style['top']}>
+                        <div className={style['top-inputs']}>
+                            {/* left */}
+
+                            <div className={style['input-container']}>
+                                <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Name'}>
+                                    <TextArea maxRows={5} value={name} onChange={(evt, value) => {
+                                        this.setState({name: evt.target.value})
+                                    }}/>
+                                </TitleInput>
+                            </div>
+                            <div className={style['input-container']}>
+                                <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Description'}>
+                                    <TextArea maxRows={5} value={description} onChange={(evt, value) => {
+                                        this.setState({description: evt.target.value})
+                                    }}/>
+                                </TitleInput>
+                            </div>
+                            <div className={style['input-container']}>
+                                <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Base url'}>
+                                    <TextArea maxRows={5} value={baseUrl} placeholder={'http://my.api.com/'}
+                                              onChange={(evt, value) => {
+                                                  this.setState({baseUrl: evt.target.value})
+                                              }}/>
+                                </TitleInput>
+                            </div>
+
+                            <div className={style['input-container']}>
+                                <TitleInput style={{flex: '1', marginTop: '2px'}} title={'Processor'}>
+                                    <ProcessorsDropDown
+                                        onChange={this.onProcessorChosen} options={processorsList} value={processorId}
+                                        loading={processorsLoading}/>
+                                </TitleInput>
+
+                            </div>
+                        </div>
+                    </div>
+                    {/* bottom */}
+
+                    {this.generateScenarioDashBoard()}
+                    {this.generateBottomBar()}
+                    {error && <ErrorDialog closeDialog={this.onCloseErrorDialog} showMessage={error}/>}
+                </FormWrapper>
+            </Modal>
         )
     }
 
@@ -184,12 +183,12 @@ export class TestForm extends React.Component {
         const {isLoading, closeDialog} = this.props;
 
         return (<div style={{display: 'flex', justifyContent: 'flex-end', marginBottom: '10px'}}>
-    <div style={{display: 'flex', justifyContent: 'space-between', width: '230px'}}>
-    <Button inverted onClick={closeDialog}>Cancel</Button>
-            <Button spinner={isLoading} hover disabled={!this.state.name}
-        onClick={this.postTest}>Submit</Button>
+            <div style={{display: 'flex', justifyContent: 'space-between', width: '230px'}}>
+                <Button inverted onClick={closeDialog}>Cancel</Button>
+                <Button spinner={isLoading} hover disabled={!this.state.name}
+                        onClick={this.postTest}>Submit</Button>
             </div>
-            </div>)
+        </div>)
     };
     addScenarioHandler = () => {
         const {scenarios} = this.state;
@@ -357,70 +356,70 @@ export class TestForm extends React.Component {
         const activeTabKey = currentScenarioIndex === null ? before.id : scenarios[currentScenarioIndex] && scenarios[currentScenarioIndex].id;
         return (
             <div className={style['bottom']}>
-            {/* bottom */}
-            <div style={{
-            marginLeft: 'auto',
-                marginRight: '12px',
-                display: 'flex',
-                justifyContent: 'space-between',
-            // width: '313px'
-        }}>
-
-    <div className={style['actions-style']} onClick={this.addScenarioHandler}>+Add Scenario</div>
-        <div className={style['actions-style']} onClick={this.addStepHandler}>+Add Step</div>
-        <div className={style['actions-style']} onClick={() => this.addStepHandler(SLEEP)}>+Add Sleep</div>
-        <div className={style['actions-style']} onClick={this.addBeforeHandler}>+Add Before</div>
-        <div className={style['actions-style']}
-        onClick={() => this.setState({csvMode: true})}>{(csvFile || csvMetadata) ? 'Modify' : '+Add'} CSV
-        </div>
-        </div>
-        {csvMode &&
-        <DragAndDrop csvMetadata={csvMetadata} csvFile={currentCsvFile}
-            onDropFile={(file) => this.setState({csvFile: file})}/>}
-        <Tabs onTabChosen={(key) => this.onChooseScenario(key)} activeTabKey={activeTabKey}
-            className={style.tabs}>
-                {
-                    tabsData.map((tabData, index) => {
-                        return (
-                            <Tabs.TabPane style={{
-                            padding: '10px',
-                                display: 'flex',
-                                alignItems: 'center',
-                                flexDirection: 'column',
-                                flex: 1
-                        }} tab={tabData.scenario_name || 'Scenario'}
-                        key={tabData.id}>
-                            {
-                        !tabData.isBefore &&
-                        <div style={{width: "80%"}}>
-
-                    <CollapsibleScenarioConfig
-                        allowedWeight={this.calcMaxAllowedWeight()}
-                        scenario={tabData}
-                        onChangeValueOfScenario={this.onChangeValueOfScenario}
-                        processorsExportedFunctions={processorsExportedFunctions}
-                        onDeleteScenario={scenarios.length === 1 ? undefined : this.onDeleteScenario}
-                        onDuplicateScenario={this.onDuplicateScenario}
-                        />
-                        </div>
-
+                {/* bottom */}
+                <div style={{
+                    marginLeft: 'auto',
+                    marginRight: '12px',
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    // width: '313px'
+                }}>
+
+                    <div className={style['actions-style']} onClick={this.addScenarioHandler}>+Add Scenario</div>
+                    <div className={style['actions-style']} onClick={this.addStepHandler}>+Add Step</div>
+                    <div className={style['actions-style']} onClick={() => this.addStepHandler(SLEEP)}>+Add Sleep</div>
+                    <div className={style['actions-style']} onClick={this.addBeforeHandler}>+Add Before</div>
+                    <div className={style['actions-style']}
+                         onClick={() => this.setState({csvMode: true})}>{(csvFile || csvMetadata) ? 'Modify' : '+Add'} CSV
+                    </div>
+                </div>
+                {csvMode &&
+                <DragAndDrop csvMetadata={csvMetadata} csvFile={currentCsvFile}
+                             onDropFile={(file) => this.setState({csvFile: file})}/>}
+                <Tabs onTabChosen={(key) => this.onChooseScenario(key)} activeTabKey={activeTabKey}
+                      className={style.tabs}>
+                    {
+                        tabsData.map((tabData, index) => {
+                            return (
+                                <Tabs.TabPane style={{
+                                    padding: '10px',
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                    flexDirection: 'column',
+                                    flex: 1
+                                }} tab={tabData.scenario_name || 'Scenario'}
+                                              key={tabData.id}>
+                                    {
+                                        !tabData.isBefore &&
+                                        <div style={{width: "80%"}}>
+
+                                            <CollapsibleScenarioConfig
+                                                allowedWeight={this.calcMaxAllowedWeight()}
+                                                scenario={tabData}
+                                                onChangeValueOfScenario={this.onChangeValueOfScenario}
+                                                processorsExportedFunctions={processorsExportedFunctions}
+                                                onDeleteScenario={scenarios.length === 1 ? undefined : this.onDeleteScenario}
+                                                onDuplicateScenario={this.onDuplicateScenario}
+                                            />
+                                        </div>
+
+                                    }
+                                    <div style={{width: "70%"}}>
+                                        <StepsList steps={tabData.steps}
+                                                   onChangeValueOfStep={this.onChangeValueOfStep}
+                                                   processorsExportedFunctions={processorsExportedFunctions}
+                                                   onDeleteStep={this.onDeleteStep}
+                                                   onDuplicateStep={this.onDuplicateStep}
+                                                   updateStepOrder={this.updateStepOrder}
+                                        />
+                                    </div>
+
+                                </Tabs.TabPane>
+                            )
+                        })
                     }
-                    <div style={{width: "70%"}}>
-                    <StepsList steps={tabData.steps}
-                        onChangeValueOfStep={this.onChangeValueOfStep}
-                        processorsExportedFunctions={processorsExportedFunctions}
-                        onDeleteStep={this.onDeleteStep}
-                        onDuplicateStep={this.onDuplicateStep}
-                        updateStepOrder={this.updateStepOrder}
-                        />
-                        </div>
-
-                        </Tabs.TabPane>
-                    )
-                    })
-                }
                 </Tabs>
-                </div>
+            </div>
         )
     };
 
@@ -450,35 +449,35 @@ export const DragAndDrop = ({csvFile, onDropFile, csvMetadata}) => {
     };
     return (
         <div style={styles}>
-        <FileDrop
-    targetClassName={style.fileDropTarget}
-    className={style.fileDrop}
-    // onFrameDragEnter={(event) => console.log('onFrameDragEnter', event)}
-    // onFrameDragLeave={(event) => console.log('onFrameDragLeave', event)}
-    // o    nFrameDrop={(event) => console.log('onFrameDrop', event)}
-    // onDragOver={(event) => console.log('onDragOver', event)}
-    // onDragLeave={(event) => console.log('onDragLeave', event)}
-    onDrop={(files, event) => {
-        onDropFile(files[0])
-    }}
->
-
-    {
-        csvFile && csvFile.name
-        ||
-        <span>Drop csv file here</span>
-    }
+            <FileDrop
+                targetClassName={style.fileDropTarget}
+                className={style.fileDrop}
+                // onFrameDragEnter={(event) => console.log('onFrameDragEnter', event)}
+                // onFrameDragLeave={(event) => console.log('onFrameDragLeave', event)}
+                // o    nFrameDrop={(event) => console.log('onFrameDrop', event)}
+                // onDragOver={(event) => console.log('onDragOver', event)}
+                // onDragLeave={(event) => console.log('onDragLeave', event)}
+                onDrop={(files, event) => {
+                    onDropFile(files[0])
+                }}
+            >
 
-    {csvMetadata &&
-    <div className={style['download-button']}
-        onClick={() => window.open(`${env.PREDATOR_URL}/files/${csvMetadata.id}`)}>
-    <FontAwesomeIcon icon={faDownload}/>
-    </div>
-    }
+                {
+                    csvFile && csvFile.name
+                    ||
+                    <span>Drop csv file here</span>
+                }
 
-</FileDrop>
-    </div>
-);
+                {csvMetadata &&
+                <div className={style['download-button']}
+                     onClick={() => window.open(`${env.PREDATOR_URL}/files/${csvMetadata.id}`)}>
+                    <FontAwesomeIcon icon={faDownload}/>
+                </div>
+                }
+
+            </FileDrop>
+        </div>
+    );
 };
 
 function mapStateToProps(state) {
diff --git a/ui/src/features/components/TestForm/utils.js b/ui/src/features/components/TestForm/utils.js
index cc5a21c28..7ec370854 100644
--- a/ui/src/features/components/TestForm/utils.js
+++ b/ui/src/features/components/TestForm/utils.js
@@ -29,7 +29,7 @@ export const createTestRequest = (data) => {
     }
 };
 
-export const createStateForEditTest = (test) => {
+export const createStateForEditTest = (test, cloneMode) => {
     test = cloneDeep(test);
     const {artillery_test} = test;
     const scenarios = testScenarioToTestScenario(artillery_test.scenarios);
@@ -43,7 +43,7 @@ export const createStateForEditTest = (test) => {
         activeTabKey: scenarios[0] && scenarios[0].id,
         type: test.type,
         processorId: test.processor_id,
-        editMode: true,
+        editMode: !cloneMode,
         processorsExportedFunctions: [],
         csvFileId: test.csv_file_id
     }
diff --git a/ui/src/features/configurationColumn.js b/ui/src/features/configurationColumn.js
index ca2a81a31..97e863f2f 100644
--- a/ui/src/features/configurationColumn.js
+++ b/ui/src/features/configurationColumn.js
@@ -14,6 +14,7 @@ import {
     faCloudDownloadAlt,
     faStopCircle,
     faTrashAlt,
+    faClone,
     faPen
 } from '@fortawesome/free-solid-svg-icons'
 import classnames from 'classnames';
@@ -32,7 +33,7 @@ const semiLarge = 70;
 const largeSize = 85;
 const extraLargeSize = 100;
 const extraExLargeSize = 120;
-export const getColumns = ({columnsNames, sortHeader = '', onSort, onReportView, onRawView, onStop, onDelete, onEdit, onRunTest, onEnableDisable, onEditNote, selectedReports, onReportSelected}) => {
+export const getColumns = ({columnsNames, sortHeader = '', onSort, onReportView, onRawView, onStop, onDelete, onEdit, onRunTest, onEnableDisable, onEditNote, selectedReports, onReportSelected, onClone}) => {
 
     const columns = [
         {
@@ -190,7 +191,7 @@ export const getColumns = ({columnsNames, sortHeader = '', onSort, onReportView,
                 </TableHeader>
             ),
             accessor: data => (<div className={css['header-time']}>{dateFormatter(data.end_time)}</div>),
-            width: extraLargeSize,
+            width: extraExLargeSize,
             className: css['center-flex'],
         },
         {
@@ -408,6 +409,19 @@ export const getColumns = ({columnsNames, sortHeader = '', onSort, onReportView,
             }}/>,
             width: mediumSize,
             className: css['center-flex'],
+        },  {
+            id: 'clone',
+            Header: () => (
+                <TableHeader sortable={false}>
+                    Clone
+                </TableHeader>
+            ),
+            accessor: data => <ViewButton icon={faClone} onClick={(e) => {
+                e.stopPropagation();
+                onClone(data)
+            }}/>,
+            width: mediumSize,
+            className: css['center-flex'],
         },
         {
             id: 'run_test',
diff --git a/ui/src/features/get-test-reports.js b/ui/src/features/get-test-reports.js
index dc47b4caf..95d5b1b9c 100644
--- a/ui/src/features/get-test-reports.js
+++ b/ui/src/features/get-test-reports.js
@@ -21,7 +21,7 @@ import DeleteDialog from "./components/DeleteDialog";
 const noDataMsg = 'There is no data to display.';
 const errorMsgGetReports = 'Error occurred while trying to get all reports for test.';
 const columnsNames = ['compare', 'start_time', 'end_time', 'duration', 'status', 'arrival_rate',
-    'ramp_to', 'last_success_rate', 'avg_rps', 'parallelism', 'notes', 'grafana_report', 'report', 'score', 'rerun', 'raw', 'logs'];
+    'ramp_to', 'last_success_rate', 'avg_rps', 'parallelism', 'notes', 'score', 'report', 'grafana_report', 'rerun', 'raw', 'logs'];
 
 const DESCRIPTION = 'All reports for a given test.';
 
diff --git a/ui/src/features/get-tests.js b/ui/src/features/get-tests.js
index dd905f2f7..40107a2e8 100644
--- a/ui/src/features/get-tests.js
+++ b/ui/src/features/get-tests.js
@@ -8,7 +8,8 @@ import {
     errorOnGetTests,
     errorOnGetTest,
     processingDeleteTest,
-    deleteTestSuccess
+    deleteTestSuccess,
+    errorOnDeleteTest
 } from './redux/selectors/testsSelector';
 import {createJobSuccess} from './redux/selectors/jobsSelector';
 import style from './style.scss';
@@ -23,12 +24,13 @@ import TestForm from './components/TestForm';
 import {ReactTableComponent} from "../components/ReactTable";
 import {getColumns} from "./configurationColumn";
 import Button from '../components/Button';
+import ErrorDialog from "./components/ErrorDialog";
 import _ from "lodash";
 
 
 const noDataMsg = 'There is no data to display.';
 const errorMsgGetTests = 'Error occurred while trying to get all tests.';
-const columnsNames = ['name', 'description', 'updated_at', 'type', 'run_test','report', 'edit', 'raw', 'delete'];
+const columnsNames = ['name', 'description', 'updated_at', 'type', 'run_test', 'report', 'edit', 'raw', 'clone', 'delete'];
 const DESCRIPTION = 'Tests include end-to-end scenarios that are executed at pre-configured intervals to provide in-depth performance metrics of your API.';
 
 class getTests extends React.Component {
@@ -44,7 +46,7 @@ class getTests extends React.Component {
             createTest: false,
             testForEdit: null,
             sortedTests: [],
-            sortHeader:''
+            sortHeader: ''
         }
     }
 
@@ -57,7 +59,7 @@ class getTests extends React.Component {
     }
 
 
-    onDelete= (data)=>{
+    onDelete = (data) => {
         this.setState({
             deleteDialog: true,
             testToDelete: data
@@ -69,9 +71,9 @@ class getTests extends React.Component {
         }
         const newSorted = _.filter(this.props.tests, (test) => {
             return (
-                _.includes(String(test.name).toLowerCase(),value.toLowerCase()) ||
-                _.includes(String(test.type).toLowerCase(),value.toLowerCase()) ||
-                _.includes(String(test.description).toLowerCase(),value.toLowerCase())
+                _.includes(String(test.name).toLowerCase(), value.toLowerCase()) ||
+                _.includes(String(test.type).toLowerCase(), value.toLowerCase()) ||
+                _.includes(String(test.description).toLowerCase(), value.toLowerCase())
             )
 
         });
@@ -98,23 +100,16 @@ class getTests extends React.Component {
 
     submitDelete = () => {
         this.props.deleteTest(this.state.testToDelete.id);
-        this.props.getAllTests();
         this.setState({
             deleteDialog: false
         });
     };
 
-    clearDeleteError = () => {
-        this.props.getAllTests();
-        this.props.clearErrorOnDelete();
-    };
 
     cancelDelete = () => {
         this.setState({
             deleteDialog: false
         });
-
-        this.props.deleteError ? this.clearDeleteError() : undefined
     };
 
     onRawView = (data) => {
@@ -122,16 +117,16 @@ class getTests extends React.Component {
 
     };
 
-    onEdit = (data)=>{
+    onEdit = (data) => {
         this.setState({createTest: true, testForEdit: data});
         this.props.chooseTest(data);
     };
 
-    onReportView=(data)=>{
+    onReportView = (data) => {
         history.push(`/tests/${data.id}/reports`)
     };
 
-    onRunTest=(data)=>{
+    onRunTest = (data) => {
         this.setState({
             openViewCreateJob: data
         });
@@ -146,7 +141,8 @@ class getTests extends React.Component {
     closeCreateTest = () => {
         this.setState({
             createTest: false,
-            testForEdit: null
+            testForEdit: null,
+            testForClone: null
         });
     };
 
@@ -159,10 +155,9 @@ class getTests extends React.Component {
 
 
     handleSnackbarClose = () => {
-        this.props.getAllTests();
         this.props.clearSelectedJob();
         this.props.clearSelectedTest();
-        this.props.clearDeleteTestSuccess();
+        this.props.clearAllSuccessOperationsState();
         this.setState({
             testToDelete: undefined
         });
@@ -190,8 +185,24 @@ class getTests extends React.Component {
         }
     }
 
+    onCloseErrorDialog = () => {
+        this.props.cleanAllErrors();
+    };
+    onClone = (data) => {
+        this.setState({createTest: true, testForClone: data});
+    };
+    generateFeedbackMessage = () => {
+        const {createJobSuccess, deleteTestSuccess} = this.props;
+        if (createJobSuccess && createJobSuccess.run_id) {
+            return `Job created successfully with Run ID: ${this.props.createJobSuccess.run_id}`;
+        } else if (deleteTestSuccess) {
+            return 'Test deleted successfully';
+        }
+    };
+
     render() {
-        const {sortedTests, sortHeader} = this.state;
+        const {sortedTests, sortHeader, testForEdit, testForClone} = this.state;
+        const {errorOnDeleteTest} = this.props;
         const noDataText = this.props.errorOnGetJobs ? errorMsgGetTests : this.loader();
         const columns = getColumns({
             columnsNames,
@@ -201,9 +212,11 @@ class getTests extends React.Component {
             onEdit: this.onEdit,
             onRunTest: this.onRunTest,
             onSort: this.onSort,
-            sortHeader: sortHeader
+            sortHeader: sortHeader,
+            onClone: this.onClone,
         });
-
+        const feedbackMsg = this.generateFeedbackMessage();
+        const error = errorOnDeleteTest;
         return (
             <Page title={'Tests'} description={DESCRIPTION}>
                 <Button className={style['create-button']} onClick={() => {
@@ -225,30 +238,30 @@ class getTests extends React.Component {
                     // className={style.table}
                 />
 
-                    {this.state.openViewTest
-                        ?
-                        <Dialog title_key={'id'} data={this.state.openViewTest} closeDialog={this.closeViewTestDialog}/> : null}
-                    {this.state.createTest &&
-                    <TestForm data={this.state.testForEdit} closeDialog={this.closeCreateTest}/>}
-                    {(this.state.openViewCreateJob && !this.props.createJobSuccess)
-                        ? <JobForm data={this.state.openViewCreateJob} closeDialog={this.closeViewCreateJobDialog}/> : null}
-
-
-                    {(this.state.deleteDialog && !this.props.deleteTestSuccess)
-                        ? <DeleteDialog loader={this.props.processingDeleteTest}
-                                        display={this.state.testToDelete ? this.state.testToDelete.name : ''}
-                                        onSubmit={this.submitDelete} errorOnDelete={this.props.deleteError}
-                                        onCancel={this.cancelDelete}/> : null}
-                    {/* TODO snack bar is common to al; page, need to extract it
-                    fix using redux to be with less variables.
-                  */}
-                    <Snackbar
-                        open={this.props.createJobSuccess || this.props.deleteTestSuccess}
-                        bodyStyle={{backgroundColor: '#2fbb67'}}
-                            message={(this.props.createJobSuccess && this.props.createJobSuccess.run_id) ? `Job created successfully with Run ID: ${this.props.createJobSuccess.run_id}` : 'Test deleted successfully'}
-                        autoHideDuration={4000}
-                        onRequestClose={this.handleSnackbarClose}
-                    />
+                {this.state.openViewTest
+                    ?
+                    <Dialog title_key={'id'} data={this.state.openViewTest}
+                            closeDialog={this.closeViewTestDialog}/> : null}
+                {this.state.createTest &&
+                <TestForm data={testForEdit || testForClone} closeDialog={this.closeCreateTest}
+                          cloneMode={!!testForClone}/>}
+                {(this.state.openViewCreateJob && !this.props.createJobSuccess)
+                    ? <JobForm data={this.state.openViewCreateJob} closeDialog={this.closeViewCreateJobDialog}/> : null}
+
+                {(this.state.deleteDialog && !this.props.deleteTestSuccess)
+                    ? <DeleteDialog loader={this.props.processingDeleteTest}
+                                    display={this.state.testToDelete ? this.state.testToDelete.name : ''}
+                                    onSubmit={this.submitDelete} errorOnDelete={this.props.deleteError}
+                                    onCancel={this.cancelDelete}/> : null}
+                <Snackbar
+                    open={!!feedbackMsg}
+                    bodyStyle={{backgroundColor: '#2fbb67'}}
+                    message={feedbackMsg}
+                    autoHideDuration={4000}
+                    onRequestClose={this.handleSnackbarClose}
+                />
+                {error && <ErrorDialog closeDialog={this.onCloseErrorDialog} showMessage={error}/>}
+
             </Page>
         )
     }
@@ -263,7 +276,8 @@ function mapStateToProps(state) {
         errorOnGetTest: errorOnGetTest(state),
         createJobSuccess: createJobSuccess(state),
         processingDeleteTest: processingDeleteTest(state),
-        deleteTestSuccess: deleteTestSuccess(state)
+        deleteTestSuccess: deleteTestSuccess(state),
+        errorOnDeleteTest: errorOnDeleteTest(state)
     }
 }
 
@@ -274,7 +288,8 @@ const mapDispatchToProps = {
     getAllTests: Actions.getTests,
     chooseTest: Actions.chooseTest,
     deleteTest: Actions.deleteTest,
-    clearDeleteTestSuccess: Actions.clearDeleteTestSuccess
+    clearAllSuccessOperationsState: Actions.clearAllSuccessOperationsState,
+    cleanAllErrors: Actions.cleanAllErrors,
 };
 
 export default connect(mapStateToProps, mapDispatchToProps)(getTests);
diff --git a/ui/src/features/redux/action.js b/ui/src/features/redux/action.js
index 4cf919fc1..0f420021f 100644
--- a/ui/src/features/redux/action.js
+++ b/ui/src/features/redux/action.js
@@ -3,7 +3,7 @@ import {
     initCreateTestForm,
     editTest,
     cleanAllErrors,
-    clearDeleteTestSuccess,
+    clearAllSuccessOperationsState,
     deleteTest,
     deleteTestFailure,
     deleteTestSuccess,
@@ -21,7 +21,6 @@ import {
     createTest,
     getFileMetadata,
     getFileMetadataSuccess,
-
 } from './actions/testsActions';
 import {
     clearStopJobSuccess,
@@ -111,7 +110,7 @@ export {
     deleteTestSuccess,
     deleteTestFailure,
     clearErrorOnDeleteTest,
-    clearDeleteTestSuccess,
+    clearAllSuccessOperationsState,
     createTest,
     getFileMetadata,
     getFileMetadataSuccess,
diff --git a/ui/src/features/redux/actions/testsActions.js b/ui/src/features/redux/actions/testsActions.js
index 0542f9216..3b084c94d 100644
--- a/ui/src/features/redux/actions/testsActions.js
+++ b/ui/src/features/redux/actions/testsActions.js
@@ -62,13 +62,14 @@ export const clearErrorOnDeleteTest = () => (
     {type: Types.CLEAR_ERROR_DELETE_TEST}
 );
 
-export const clearDeleteTestSuccess = () => (
-    {type: Types.CLEAR_DELETE_TEST_SUCCESS}
+export const clearAllSuccessOperationsState = () => (
+    {type: Types.CLEAR_ALL_SUCCESS_OPERATIONS_STATE}
 );
 
 export const createTest = (body, file) => (
     {type: Types.CREATE_TEST, body, file}
 );
+
 export const createTestSuccess = () => (
     {type: Types.CREATE_TEST_SUCCESS}
 );
diff --git a/ui/src/features/redux/reducers/testsReducer.js b/ui/src/features/redux/reducers/testsReducer.js
index 6ea5293f4..9f18ca144 100644
--- a/ui/src/features/redux/reducers/testsReducer.js
+++ b/ui/src/features/redux/reducers/testsReducer.js
@@ -2,67 +2,67 @@ import Immutable from 'immutable';
 import * as Types from '../types/testsTypes'
 
 const initialState = Immutable.Map({
-  tests: [],
-  test: undefined,
-  processing_get_tests: false,
-  error_get_tests: undefined,
-  error_get_test: undefined,
-  delete_test_success: false,
-  error_delete_test: undefined,
-  error_create_test: undefined,
-  processing_delete_test: false,
-  create_test_success: false,
-  isLoading: false,
-  csv_metadata: null
+    tests: [],
+    test: undefined,
+    processing_get_tests: false,
+    error_get_tests: undefined,
+    error_get_test: undefined,
+    delete_test_success: false,
+    error_delete_test: undefined,
+    error_create_test: undefined,
+    processing_delete_test: false,
+    create_test_success: false,
+    isLoading: false,
+    csv_metadata: null,
 });
 
-export default function reduce (state = initialState, action = {}) {
-  switch (action.type) {
-  case Types.GET_TESTS_FAILURE:
-    return state.set('error_get_tests', action.error);
-  case Types.GET_TESTS_SUCCESS:
-    return state.set('tests', action.tests);
-  case Types.CLEAR_TESTS:
-    return state.set('tests', undefined);
-  case Types.CLEAR_ERROR_ON_GET_TESTS:
-    return state.set('error_get_tests', undefined);
-  case Types.GET_TEST_FAILURE:
-    return state.set('error_get_test', action.error);
-  case Types.SET_TEST:
-    return state.set('test', action.test);
-  case Types.GET_TEST_SUCCESS:
-    return state.set('test', action.test);
-  case Types.PROCESSING_GET_TESTS:
-    return state.set('processing_get_tests', action.state);
-  case Types.CLEAR_SELECTED_TEST:
-    return state.set('test', undefined);
-  case Types.DELETE_TEST_SUCCESS:
-    return state.set('delete_test_success', true);
-  case Types.CREATE_TEST_SUCCESS:
-    return state.set('create_test_success', true);
-  case Types.CLEAR_DELETE_TEST_SUCCESS:
-    return state.set('delete_test_success', false);
-  case Types.DELETE_TEST_FAILURE:
-    return state.set('error_delete_test', action.error);
-  case Types.CREATE_TEST_FAILURE:
-    return state.set('error_create_test', action.error);
-  case Types.CLEAR_ERROR_DELETE_TEST:
-    return state.set('error_delete_test', undefined);
-  case Types.PROCESSING_DELETE_TEST:
-    return state.set('processing_delete_test', action.state);
-  case Types.IS_LOADING:
-    return state.set('isLoading', action.isLoading);
-  case Types.CLEAN_ALL_ERRORS:
-    return state.set('error_create_test', undefined)
-      .set('error_get_tests', undefined)
-      .set('error_delete_test', undefined);
-  case Types.INIT_CREATE_FORM:
-    return state.set('create_test_success', false)
-      .set('error_create_test', undefined);
-  case Types.GET_FILE_METADATA_SUCCESS:
-    return state.set('csv_metadata', action.fileMetadata);
-
-  default:
-    return state;
-  }
+export default function reduce(state = initialState, action = {}) {
+    switch (action.type) {
+        case Types.GET_TESTS_FAILURE:
+            return state.set('error_get_tests', action.error);
+        case Types.GET_TESTS_SUCCESS:
+            return state.set('tests', action.tests);
+        case Types.CLEAR_TESTS:
+            return state.set('tests', undefined);
+        case Types.CLEAR_ERROR_ON_GET_TESTS:
+            return state.set('error_get_tests', undefined);
+        case Types.GET_TEST_FAILURE:
+            return state.set('error_get_test', action.error);
+        case Types.SET_TEST:
+            return state.set('test', action.test);
+        case Types.GET_TEST_SUCCESS:
+            return state.set('test', action.test);
+        case Types.PROCESSING_GET_TESTS:
+            return state.set('processing_get_tests', action.state);
+        case Types.CLEAR_SELECTED_TEST:
+            return state.set('test', undefined);
+        case Types.DELETE_TEST_SUCCESS:
+            return state.set('delete_test_success', true);
+        case Types.CREATE_TEST_SUCCESS:
+            return state.set('create_test_success', true);
+        case Types.CLEAR_ALL_SUCCESS_OPERATIONS_STATE:
+            return state.set('delete_test_success', false)
+                .set('create_test_success',false);
+        case Types.DELETE_TEST_FAILURE:
+            return state.set('error_delete_test', action.error);
+        case Types.CREATE_TEST_FAILURE:
+            return state.set('error_create_test', action.error);
+        case Types.CLEAR_ERROR_DELETE_TEST:
+            return state.set('error_delete_test', undefined);
+        case Types.PROCESSING_DELETE_TEST:
+            return state.set('processing_delete_test', action.state);
+        case Types.IS_LOADING:
+            return state.set('isLoading', action.isLoading);
+        case Types.CLEAN_ALL_ERRORS:
+            return state.set('error_create_test', undefined)
+                .set('error_get_tests', undefined)
+                .set('error_delete_test', undefined);
+        case Types.INIT_CREATE_FORM:
+            return state.set('create_test_success', false)
+                .set('error_create_test', undefined);
+        case Types.GET_FILE_METADATA_SUCCESS:
+            return state.set('csv_metadata', action.fileMetadata);
+        default:
+            return state;
+    }
 }
diff --git a/ui/src/features/redux/saga/testsSagas.js b/ui/src/features/redux/saga/testsSagas.js
index 3bd55007a..a20417878 100644
--- a/ui/src/features/redux/saga/testsSagas.js
+++ b/ui/src/features/redux/saga/testsSagas.js
@@ -94,21 +94,12 @@ export function* editTest(action) {
 export function* deleteTest({testId}) {
     try {
         yield call(deleteTestInFramework, testId);
-        yield put(Actions.deleteTestSuccess())
-    } catch (e) {
-        yield put(Actions.deleteTestFailure(e))
-    }
-}
-
-export function* uploadFile({testId}) {
-    try {
-        yield call(deleteTestInFramework, testId);
-        yield put(Actions.deleteTestSuccess())
+        yield put(Actions.deleteTestSuccess());
+        yield call(getTests);
     } catch (e) {
         yield put(Actions.deleteTestFailure(e))
     }
 }
-
 export function* testsRegister() {
     yield takeLatest(Types.GET_TESTS, getTests);
     yield takeLatest(Types.GET_TEST, getTest);
diff --git a/ui/src/features/redux/selectors/testsSelector.js b/ui/src/features/redux/selectors/testsSelector.js
index c632b6917..a207d484a 100644
--- a/ui/src/features/redux/selectors/testsSelector.js
+++ b/ui/src/features/redux/selectors/testsSelector.js
@@ -1,6 +1,7 @@
 export const tests = (state) => state.TestsReducer.get('tests');
 export const errorOnGetTests = (state) => state.TestsReducer.get('error_get_tests');
 export const errorOnCreateTest = (state) => state.TestsReducer.get('error_create_test');
+export const errorOnDeleteTest = (state) => state.TestsReducer.get('error_delete_test');
 export const createTestSuccess = (state) => state.TestsReducer.get('create_test_success');
 export const test = (state) => state.TestsReducer.get('test');
 export const errorOnGetTest = (state) => state.TestsReducer.get('error_get_test');
diff --git a/ui/src/features/redux/types/testsTypes.js b/ui/src/features/redux/types/testsTypes.js
index f2f3dd0c7..21a50d0fb 100644
--- a/ui/src/features/redux/types/testsTypes.js
+++ b/ui/src/features/redux/types/testsTypes.js
@@ -20,10 +20,12 @@ export const DELETE_TEST_SUCCESS = 'DELETE_TEST_SUCCESS';
 export const DELETE_TEST_FAILURE = 'DELETE_TEST_FAILURE';
 export const CLEAR_ERROR_DELETE_TEST = 'CLEAR_ERROR_DELETE_TEST';
 export const PROCESSING_DELETE_TEST = 'PROCESSING_DELETE_TEST';
-export const CLEAR_DELETE_TEST_SUCCESS = 'CLEAR_DELETE_TEST_SUCCESS';
+export const CLEAR_ALL_SUCCESS_OPERATIONS_STATE = 'CLEAR_ALL_SUCCESS_OPERATIONS_STATE';
+
 export const CREATE_TEST = 'CREATE_TEST';
 export const CREATE_TEST_SUCCESS = 'CREATE_TEST_SUCCESS';
 export const CREATE_TEST_FAILURE = 'CREATE_TEST_FAILURE';
+
 export const IS_LOADING = 'IS_LOADING';
 export const CLEAN_ALL_ERRORS = 'CLEAN_ALL_ERRORS';
 export const INIT_CREATE_FORM = 'INIT_CREATE_FORM';