From 3ef99c287e0f5e932887f1df4fe1e305c80a2113 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 8 Nov 2022 10:40:19 +0100
Subject: [PATCH] :recycle: Refactor tests directory structure

---
 .circleci/config.yml                          |  12 +++++-----
 backend/dev/user.clj                          |   2 +-
 ..._handling.clj => bounce_handling_test.clj} |   4 ++--
 ...ail_sending.clj => email_sending_test.clj} |   4 ++--
 .../{test_helpers.clj => helpers.clj}         |   4 ++--
 .../{test_rpc_file.clj => rpc_file_test.clj}  |   6 ++---
 .../{test_rpc_font.clj => rpc_font_test.clj}  |   8 +++----
 ...management.clj => rpc_management_test.clj} |   6 ++---
 ...{test_rpc_media.clj => rpc_media_test.clj} |   8 +++----
 ...t_rpc_profile.clj => rpc_profile_test.clj} |   6 ++---
 ...t_rpc_project.clj => rpc_project_test.clj} |   4 ++--
 .../{test_rpc_team.clj => rpc_team_test.clj}  |   4 ++--
 ...est_rpc_viewer.clj => rpc_viewer_test.clj} |   4 ++--
 .../{test_storage.clj => storage_test.clj}    |  12 +++++-----
 ...etry_task.clj => tasks_telemetry_test.clj} |   4 ++--
 .../backend_tests/test_files/template.penpot  | Bin 0 -> 8815 bytes
 ...ects_map.clj => util_objects_map_test.clj} |   4 ++--
 ...nter_map.clj => util_pointer_map_test.clj} |   4 ++--
 common/shadow-cljs.edn                        |   2 +-
 .../{test_data.cljc => data_test.cljc}        |   2 +-
 ...geom_shapes.cljc => geom_shapes_test.cljc} |   2 +-
 .../{test_geom.cljc => geom_test.cljc}        |   2 +-
 .../{test_helpers => helpers}/components.cljc |   2 +-
 .../{test_helpers => helpers}/files.cljc      |   2 +-
 ...s_helpers.cljc => pages_helpers_test.cljc} |   2 +-
 ...ations.cljc => pages_migrations_test.cljc} |   2 +-
 .../{test_pages.cljc => pages_test.cljc}      |   2 +-
 .../test/common_tests/setup.cljs              |   4 ++--
 common/test/common_tests/test_setup.cljc      |  10 --------
 .../{test_text.cljc => text_test.cljc}        |   2 +-
 ...t_types_file.cljc => types_file_test.cljc} |   6 ++---
 ...ljc => types_shape_interactions_test.cljc} |   2 +-
 .../{test_types.cljc => types_test.cljc}      |   2 +-
 .../{test_uuid.cljc => uuid_test.cljc}        |   2 +-
 frontend/shadow-cljs.edn                      |   2 +-
 .../helpers}/events.cljs                      |  14 +++++++----
 .../helpers}/libraries.cljs                   |  16 +++++++++----
 .../helpers}/pages.cljs                       |  20 ++++++++++------
 .../helpers_shapes_test.cljs}                 |  14 +++++++----
 frontend/test/frontend_tests/setup.cljs       |  22 ++++++++++++++++++
 .../state_components_sync_test.cljs}          |  16 +++++++++----
 .../state_components_test.cljs}               |   8 +++----
 .../util_range_tree_test.cljs}                |  14 +++++++----
 .../util_simple_math_test.cljs}               |   8 ++++++-
 .../util_snap_data_test.cljs}                 |  10 ++++----
 45 files changed, 170 insertions(+), 116 deletions(-)
 rename backend/test/backend_tests/{test_bounce_handling.clj => bounce_handling_test.clj} (99%)
 rename backend/test/backend_tests/{test_email_sending.clj => email_sending_test.clj} (90%)
 rename backend/test/backend_tests/{test_helpers.clj => helpers.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_file.clj => rpc_file_test.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_font.clj => rpc_font_test.clj} (92%)
 rename backend/test/backend_tests/{test_rpc_management.clj => rpc_management_test.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_media.clj => rpc_media_test.clj} (96%)
 rename backend/test/backend_tests/{test_rpc_profile.clj => rpc_profile_test.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_project.clj => rpc_project_test.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_team.clj => rpc_team_test.clj} (99%)
 rename backend/test/backend_tests/{test_rpc_viewer.clj => rpc_viewer_test.clj} (98%)
 rename backend/test/backend_tests/{test_storage.clj => storage_test.clj} (97%)
 rename backend/test/backend_tests/{test_telemetry_task.clj => tasks_telemetry_test.clj} (96%)
 create mode 100644 backend/test/backend_tests/test_files/template.penpot
 rename backend/test/backend_tests/{test_util_objects_map.clj => util_objects_map_test.clj} (98%)
 rename backend/test/backend_tests/{test_util_pointer_map.clj => util_pointer_map_test.clj} (98%)
 rename common/test/common_tests/{test_data.cljc => data_test.cljc} (98%)
 rename common/test/common_tests/{test_geom_shapes.cljc => geom_shapes_test.cljc} (99%)
 rename common/test/common_tests/{test_geom.cljc => geom_test.cljc} (99%)
 rename common/test/common_tests/{test_helpers => helpers}/components.cljc (99%)
 rename common/test/common_tests/{test_helpers => helpers}/files.cljc (99%)
 rename common/test/common_tests/{test_pages_helpers.cljc => pages_helpers_test.cljc} (97%)
 rename common/test/common_tests/{test_pages_migrations.cljc => pages_migrations_test.cljc} (98%)
 rename common/test/common_tests/{test_pages.cljc => pages_test.cljc} (99%)
 rename frontend/test/app/init_test.cljs => common/test/common_tests/setup.cljs (73%)
 delete mode 100644 common/test/common_tests/test_setup.cljc
 rename common/test/common_tests/{test_text.cljc => text_test.cljc} (97%)
 rename common/test/common_tests/{test_types_file.cljc => types_file_test.cljc} (98%)
 rename common/test/common_tests/{test_types_shape_interactions.cljc => types_shape_interactions_test.cljc} (99%)
 rename common/test/common_tests/{test_types.cljc => types_test.cljc} (98%)
 rename common/test/common_tests/{test_uuid.cljc => uuid_test.cljc} (96%)
 rename frontend/test/{app/test_helpers => frontend_tests/helpers}/events.cljs (87%)
 rename frontend/test/{app/test_helpers => frontend_tests/helpers}/libraries.cljs (93%)
 rename frontend/test/{app/test_helpers => frontend_tests/helpers}/pages.cljs (93%)
 rename frontend/test/{app/shapes_test.cljs => frontend_tests/helpers_shapes_test.cljs} (77%)
 create mode 100644 frontend/test/frontend_tests/setup.cljs
 rename frontend/test/{app/components_sync_test.cljs => frontend_tests/state_components_sync_test.cljs} (99%)
 rename frontend/test/{app/components_basic_test.cljs => frontend_tests/state_components_test.cljs} (99%)
 rename frontend/test/{app/util/range_tree_test.cljs => frontend_tests/util_range_tree_test.cljs} (95%)
 rename frontend/test/{app/util/simple_math_test.cljs => frontend_tests/util_simple_math_test.cljs} (91%)
 rename frontend/test/{app/util/snap_data_test.cljs => frontend_tests/util_snap_data_test.cljs} (99%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f044e17803..4d219ba911 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -62,19 +62,19 @@ jobs:
           name: common tests
           command: |
             yarn install
-            yarn run compile-test
-            node target/test.js
-            clojure -X:dev:test :patterns '["common-tests.test-.*"]'
+            yarn test
+            clojure -X:dev:test :patterns '["common-tests.*-test"]'
 
           environment:
             PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
             JVM_OPTS: -Xmx4g
+            NODE_OPTIONS: --max-old-space-size=4096
 
       - run:
           name: backend test
           working_directory: "./backend"
           command: |
-            clojure -X:dev:test :patterns '["app-tests.test-.*"]'
+            clojure -X:dev:test :patterns '["backend-tests.*-test"]'
 
           environment:
             PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
@@ -88,11 +88,11 @@ jobs:
           working_directory: "./frontend"
           command: |
             yarn install
-            clojure -M:dev:shadow-cljs compile test
-            node target/tests.js
+            yarn test
 
           environment:
             PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+            NODE_OPTIONS: --max-old-space-size=4096
 
       - save_cache:
          paths:
diff --git a/backend/dev/user.clj b/backend/dev/user.clj
index a0cff02752..dce35764b6 100644
--- a/backend/dev/user.clj
+++ b/backend/dev/user.clj
@@ -63,7 +63,7 @@
 ;; --- Development Stuff
 
 (defn- run-tests
-  ([] (run-tests #"^backend-tests.test-.*$"))
+  ([] (run-tests #"^backend-tests.*-test$"))
   ([o]
    (repl/refresh)
    (cond
diff --git a/backend/test/backend_tests/test_bounce_handling.clj b/backend/test/backend_tests/bounce_handling_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_bounce_handling.clj
rename to backend/test/backend_tests/bounce_handling_test.clj
index a85616ffed..2938ecc9f1 100644
--- a/backend/test/backend_tests/test_bounce_handling.clj
+++ b/backend/test/backend_tests/bounce_handling_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-bounce-handling
+(ns backend-tests.bounce-handling-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.db :as db]
    [app.emails :as emails]
    [app.http.awsns :as awsns]
diff --git a/backend/test/backend_tests/test_email_sending.clj b/backend/test/backend_tests/email_sending_test.clj
similarity index 90%
rename from backend/test/backend_tests/test_email_sending.clj
rename to backend/test/backend_tests/email_sending_test.clj
index 685d657791..49802dd9e7 100644
--- a/backend/test/backend_tests/test_email_sending.clj
+++ b/backend/test/backend_tests/email_sending_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-email-sending
+(ns backend-tests.email-sending-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.db :as db]
    [app.emails :as emails]
    [clojure.test :as t]
diff --git a/backend/test/backend_tests/test_helpers.clj b/backend/test/backend_tests/helpers.clj
similarity index 99%
rename from backend/test/backend_tests/test_helpers.clj
rename to backend/test/backend_tests/helpers.clj
index 01948bcb99..75b3a3eb8f 100644
--- a/backend/test/backend_tests/test_helpers.clj
+++ b/backend/test/backend_tests/helpers.clj
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-helpers
+(ns backend-tests.helpers
   (:require
    [app.common.data :as d]
    [app.common.flags :as flags]
@@ -65,7 +65,7 @@
                     :name "test"
                     :file-uri "test"
                     :thumbnail-uri "test"
-                    :path (-> "app_tests/test_files/template.penpot" io/resource fs/path)}]
+                    :path (-> "backend_tests/test_files/template.penpot" io/resource fs/path)}]
         system (-> (merge main/system-config main/worker-config)
                    (assoc-in [:app.redis/redis :uri] (:redis-uri config))
                    (assoc-in [:app.db/pool :uri] (:database-uri config))
diff --git a/backend/test/backend_tests/test_rpc_file.clj b/backend/test/backend_tests/rpc_file_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_rpc_file.clj
rename to backend/test/backend_tests/rpc_file_test.clj
index 15fc74fc81..6f7562b542 100644
--- a/backend/test/backend_tests/test_rpc_file.clj
+++ b/backend/test/backend_tests/rpc_file_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-file
+(ns backend-tests.rpc-file-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.db.sql :as sql]
@@ -124,7 +124,7 @@
 (t/deftest file-gc-task
   (letfn [(create-file-media-object [{:keys [profile-id file-id]}]
             (let [mfile  {:filename "sample.jpg"
-                          :path (th/tempfile "app_tests/test_files/sample.jpg")
+                          :path (th/tempfile "backend_tests/test_files/sample.jpg")
                           :mtype "image/jpeg"
                           :size 312043}
                   params {::th/type :upload-file-media-object
diff --git a/backend/test/backend_tests/test_rpc_font.clj b/backend/test/backend_tests/rpc_font_test.clj
similarity index 92%
rename from backend/test/backend_tests/test_rpc_font.clj
rename to backend/test/backend_tests/rpc_font_test.clj
index f6c6c75d27..6116b8d8aa 100644
--- a/backend/test/backend_tests/test_rpc_font.clj
+++ b/backend/test/backend_tests/rpc_font_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-font
+(ns backend-tests.rpc-font-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
@@ -24,7 +24,7 @@
         proj-id (:default-project-id prof)
         font-id (uuid/custom 10 1)
 
-        ttfdata (-> (io/resource "app_tests/test_files/font-1.ttf")
+        ttfdata (-> (io/resource "backend_tests/test_files/font-1.ttf")
                     io/input-stream
                     io/read-as-bytes)
 
@@ -59,7 +59,7 @@
         proj-id (:default-project-id prof)
         font-id (uuid/custom 10 1)
 
-        data    (-> (io/resource "app_tests/test_files/font-1.woff")
+        data    (-> (io/resource "backend_tests/test_files/font-1.woff")
                     io/input-stream
                     io/read-as-bytes)
 
diff --git a/backend/test/backend_tests/test_rpc_management.clj b/backend/test/backend_tests/rpc_management_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_rpc_management.clj
rename to backend/test/backend_tests/rpc_management_test.clj
index 9c68bd94c2..c1f03838d9 100644
--- a/backend/test/backend_tests/test_rpc_management.clj
+++ b/backend/test/backend_tests/rpc_management_test.clj
@@ -4,10 +4,10 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-management
+(ns backend-tests.rpc-management-test
   (:require
-   [backend-tests.test-storage :refer [configure-storage-backend]]
-   [backend-tests.test-helpers :as th]
+   [backend-tests.storage-test :refer [configure-storage-backend]]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
diff --git a/backend/test/backend_tests/test_rpc_media.clj b/backend/test/backend_tests/rpc_media_test.clj
similarity index 96%
rename from backend/test/backend_tests/test_rpc_media.clj
rename to backend/test/backend_tests/rpc_media_test.clj
index dbe3fe68ec..5fb6f99051 100644
--- a/backend/test/backend_tests/test_rpc_media.clj
+++ b/backend/test/backend_tests/rpc_media_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-media
+(ns backend-tests.rpc-media-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.storage :as sto]
@@ -60,7 +60,7 @@
                                    :project-id (:default-project-id prof)
                                    :is-shared false})
         mfile  {:filename "sample.jpg"
-                :path (th/tempfile "app_tests/test_files/sample.jpg")
+                :path (th/tempfile "backend_tests/test_files/sample.jpg")
                 :mtype "image/jpeg"
                 :size 312043}
 
@@ -99,7 +99,7 @@
                                    :project-id (:default-project-id prof)
                                    :is-shared false})
         mfile  {:filename "sample.jpg"
-                :path (th/tempfile "app_tests/test_files/sample.jpg")
+                :path (th/tempfile "backend_tests/test_files/sample.jpg")
                 :mtype "image/jpeg"
                 :size 312043}
 
diff --git a/backend/test/backend_tests/test_rpc_profile.clj b/backend/test/backend_tests/rpc_profile_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_rpc_profile.clj
rename to backend/test/backend_tests/rpc_profile_test.clj
index 8e89029925..1c97a904b5 100644
--- a/backend/test/backend_tests/test_rpc_profile.clj
+++ b/backend/test/backend_tests/rpc_profile_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-profile
+(ns backend-tests.rpc-profile-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
@@ -110,7 +110,7 @@
                   :profile-id (:id profile)
                   :file {:filename "sample.jpg"
                          :size 123123
-                         :path (th/tempfile "app_tests/test_files/sample.jpg")
+                         :path (th/tempfile "backend_tests/test_files/sample.jpg")
                          :mtype "image/jpeg"}}
             out  (th/mutation! data)]
 
diff --git a/backend/test/backend_tests/test_rpc_project.clj b/backend/test/backend_tests/rpc_project_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_rpc_project.clj
rename to backend/test/backend_tests/rpc_project_test.clj
index a8e4286d80..24c745a836 100644
--- a/backend/test/backend_tests/test_rpc_project.clj
+++ b/backend/test/backend_tests/rpc_project_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-project
+(ns backend-tests.rpc-project-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
diff --git a/backend/test/backend_tests/test_rpc_team.clj b/backend/test/backend_tests/rpc_team_test.clj
similarity index 99%
rename from backend/test/backend_tests/test_rpc_team.clj
rename to backend/test/backend_tests/rpc_team_test.clj
index 23dedbe88f..302f80dc50 100644
--- a/backend/test/backend_tests/test_rpc_team.clj
+++ b/backend/test/backend_tests/rpc_team_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-team
+(ns backend-tests.rpc-team-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
diff --git a/backend/test/backend_tests/test_rpc_viewer.clj b/backend/test/backend_tests/rpc_viewer_test.clj
similarity index 98%
rename from backend/test/backend_tests/test_rpc_viewer.clj
rename to backend/test/backend_tests/rpc_viewer_test.clj
index e09ba7846f..baaa416edb 100644
--- a/backend/test/backend_tests/test_rpc_viewer.clj
+++ b/backend/test/backend_tests/rpc_viewer_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-rpc-viewer
+(ns backend-tests.rpc-viewer-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [clojure.test :as t]
diff --git a/backend/test/backend_tests/test_storage.clj b/backend/test/backend_tests/storage_test.clj
similarity index 97%
rename from backend/test/backend_tests/test_storage.clj
rename to backend/test/backend_tests/storage_test.clj
index af5cd7f621..b47e98b096 100644
--- a/backend/test/backend_tests/test_storage.clj
+++ b/backend/test/backend_tests/storage_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-storage
+(ns backend-tests.storage-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.exceptions :as ex]
    [app.common.uuid :as uuid]
    [app.db :as db]
@@ -126,7 +126,7 @@
                                     :is-shared false})
 
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app_tests/test_files/sample.jpg")
+                 :path (th/tempfile "backend_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 
@@ -196,12 +196,12 @@
                                     :project-id proj-id
                                     :is-shared false})
 
-        ttfdata (-> (io/resource "app_tests/test_files/font-1.ttf")
+        ttfdata (-> (io/resource "backend_tests/test_files/font-1.ttf")
                     io/input-stream
                     io/read-as-bytes)
 
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app_tests/test_files/sample.jpg")
+                 :path (th/tempfile "backend_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 
@@ -267,7 +267,7 @@
                                     :project-id (:default-project-id prof)
                                     :is-shared false})
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app_tests/test_files/sample.jpg")
+                 :path (th/tempfile "backend_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 
diff --git a/backend/test/backend_tests/test_telemetry_task.clj b/backend/test/backend_tests/tasks_telemetry_test.clj
similarity index 96%
rename from backend/test/backend_tests/test_telemetry_task.clj
rename to backend/test/backend_tests/tasks_telemetry_test.clj
index f1b177467b..7ff727b8bc 100644
--- a/backend/test/backend_tests/test_telemetry_task.clj
+++ b/backend/test/backend_tests/tasks_telemetry_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-telemetry-task
+(ns backend-tests.tasks-telemetry-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.db :as db]
    [app.emails :as emails]
    [app.util.time :as dt]
diff --git a/backend/test/backend_tests/test_files/template.penpot b/backend/test/backend_tests/test_files/template.penpot
new file mode 100644
index 0000000000000000000000000000000000000000..e0c81bb83ef474a9e190d2f99a335e58422ae9e0
GIT binary patch
literal 8815
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

literal 0
HcmV?d00001

diff --git a/backend/test/backend_tests/test_util_objects_map.clj b/backend/test/backend_tests/util_objects_map_test.clj
similarity index 98%
rename from backend/test/backend_tests/test_util_objects_map.clj
rename to backend/test/backend_tests/util_objects_map_test.clj
index 7253e82aec..d9fa1b3d02 100644
--- a/backend/test/backend_tests/test_util_objects_map.clj
+++ b/backend/test/backend_tests/util_objects_map_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-util-objects-map
+(ns backend-tests.util-objects-map-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.spec :as us]
    [app.common.transit :as transit]
    [app.common.types.shape :as cts]
diff --git a/backend/test/backend_tests/test_util_pointer_map.clj b/backend/test/backend_tests/util_pointer_map_test.clj
similarity index 98%
rename from backend/test/backend_tests/test_util_pointer_map.clj
rename to backend/test/backend_tests/util_pointer_map_test.clj
index 7d3638a1bb..f496a57386 100644
--- a/backend/test/backend_tests/test_util_pointer_map.clj
+++ b/backend/test/backend_tests/util_pointer_map_test.clj
@@ -4,9 +4,9 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns backend-tests.test-util-pointer-map
+(ns backend-tests.util-pointer-map-test
   (:require
-   [backend-tests.test-helpers :as th]
+   [backend-tests.helpers :as th]
    [app.common.spec :as us]
    [app.common.transit :as transit]
    [app.common.types.shape :as cts]
diff --git a/common/shadow-cljs.edn b/common/shadow-cljs.edn
index bca945b8e1..a06131055d 100644
--- a/common/shadow-cljs.edn
+++ b/common/shadow-cljs.edn
@@ -8,7 +8,7 @@
   {:target :node-test
    :output-to "target/test.js"
    :output-dir "target/test/"
-   :ns-regexp "^common-tests.test-.*$"
+   :ns-regexp "^common-tests.*-test$"
    :autorun true
 
    :compiler-options
diff --git a/common/test/common_tests/test_data.cljc b/common/test/common_tests/data_test.cljc
similarity index 98%
rename from common/test/common_tests/test_data.cljc
rename to common/test/common_tests/data_test.cljc
index 85b942f744..5fd35b9200 100644
--- a/common/test/common_tests/test_data.cljc
+++ b/common/test/common_tests/data_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-data
+(ns common-tests.data-test
   (:require
    [app.common.data :as d]
    [clojure.test :as t]))
diff --git a/common/test/common_tests/test_geom_shapes.cljc b/common/test/common_tests/geom_shapes_test.cljc
similarity index 99%
rename from common/test/common_tests/test_geom_shapes.cljc
rename to common/test/common_tests/geom_shapes_test.cljc
index 1358be6acb..f86487de2c 100644
--- a/common/test/common_tests/test_geom_shapes.cljc
+++ b/common/test/common_tests/geom_shapes_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-geom-shapes
+(ns common-tests.geom-shapes-test
   (:require
    [app.common.geom.matrix :as gmt]
    [app.common.geom.point :as gpt]
diff --git a/common/test/common_tests/test_geom.cljc b/common/test/common_tests/geom_test.cljc
similarity index 99%
rename from common/test/common_tests/test_geom.cljc
rename to common/test/common_tests/geom_test.cljc
index 46786c54d2..36d99267d4 100644
--- a/common/test/common_tests/test_geom.cljc
+++ b/common/test/common_tests/geom_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-geom
+(ns common-tests.geom-test
   (:require
    [clojure.test :as t]
    [app.common.math :as mth]
diff --git a/common/test/common_tests/test_helpers/components.cljc b/common/test/common_tests/helpers/components.cljc
similarity index 99%
rename from common/test/common_tests/test_helpers/components.cljc
rename to common/test/common_tests/helpers/components.cljc
index f459ae0059..b96e0fea62 100644
--- a/common/test/common_tests/test_helpers/components.cljc
+++ b/common/test/common_tests/helpers/components.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-helpers.components
+(ns common-tests.helpers.components
   (:require
    [clojure.test :as t]
    [app.common.pages.helpers :as cph]
diff --git a/common/test/common_tests/test_helpers/files.cljc b/common/test/common_tests/helpers/files.cljc
similarity index 99%
rename from common/test/common_tests/test_helpers/files.cljc
rename to common/test/common_tests/helpers/files.cljc
index 69a51bbfad..6945051393 100644
--- a/common/test/common_tests/test_helpers/files.cljc
+++ b/common/test/common_tests/helpers/files.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-helpers.files
+(ns common-tests.helpers.files
   (:require
    [app.common.files.features :as ffeat]
    [app.common.geom.point :as gpt]
diff --git a/common/test/common_tests/test_pages_helpers.cljc b/common/test/common_tests/pages_helpers_test.cljc
similarity index 97%
rename from common/test/common_tests/test_pages_helpers.cljc
rename to common/test/common_tests/pages_helpers_test.cljc
index 50b87c8139..6079b0b840 100644
--- a/common/test/common_tests/test_pages_helpers.cljc
+++ b/common/test/common_tests/pages_helpers_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-pages-helpers
+(ns common-tests.pages-helpers-test
   (:require
    [clojure.test :as t]
    [clojure.pprint :refer [pprint]]
diff --git a/common/test/common_tests/test_pages_migrations.cljc b/common/test/common_tests/pages_migrations_test.cljc
similarity index 98%
rename from common/test/common_tests/test_pages_migrations.cljc
rename to common/test/common_tests/pages_migrations_test.cljc
index 75d593665c..e3a1a58f06 100644
--- a/common/test/common_tests/test_pages_migrations.cljc
+++ b/common/test/common_tests/pages_migrations_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-pages-migrations
+(ns common-tests.pages-migrations-test
   (:require
    [clojure.test :as t]
    [clojure.pprint :refer [pprint]]
diff --git a/common/test/common_tests/test_pages.cljc b/common/test/common_tests/pages_test.cljc
similarity index 99%
rename from common/test/common_tests/test_pages.cljc
rename to common/test/common_tests/pages_test.cljc
index aa50164b73..f90cccf778 100644
--- a/common/test/common_tests/test_pages.cljc
+++ b/common/test/common_tests/pages_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-pages
+(ns common-tests.pages-test
   (:require
    [app.common.files.features :as ffeat]
    [app.common.pages :as cp]
diff --git a/frontend/test/app/init_test.cljs b/common/test/common_tests/setup.cljs
similarity index 73%
rename from frontend/test/app/init_test.cljs
rename to common/test/common_tests/setup.cljs
index 0e36cdcd04..60b1e5ac1b 100644
--- a/frontend/test/app/init_test.cljs
+++ b/common/test/common_tests/setup.cljs
@@ -1,6 +1,6 @@
-(ns app.init-test
+(ns common-tests.setup
   (:require
-   [cljs.test :as t :include-macros true]))
+   [clojure.test :as t]))
 
 (defmethod t/report [:cljs.test/default :end-run-tests]
   [m]
diff --git a/common/test/common_tests/test_setup.cljc b/common/test/common_tests/test_setup.cljc
deleted file mode 100644
index 8dc2e87d83..0000000000
--- a/common/test/common_tests/test_setup.cljc
+++ /dev/null
@@ -1,10 +0,0 @@
-(ns common-tests.test-setup
-  (:require
-   [clojure.test :as t]))
-
-#?(:cljs
-   (defmethod t/report [:cljs.test/default :end-run-tests]
-     [m]
-     (if (t/successful? m)
-       (set! (.-exitCode js/process) 0)
-       (set! (.-exitCode js/process) 1))))
diff --git a/common/test/common_tests/test_text.cljc b/common/test/common_tests/text_test.cljc
similarity index 97%
rename from common/test/common_tests/test_text.cljc
rename to common/test/common_tests/text_test.cljc
index a6bd1c47e9..3c9fb69358 100644
--- a/common/test/common_tests/test_text.cljc
+++ b/common/test/common_tests/text_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-text
+(ns common-tests.text-test
   (:require
    [app.common.data :as d]
    [app.common.text :as txt]
diff --git a/common/test/common_tests/test_types_file.cljc b/common/test/common_tests/types_file_test.cljc
similarity index 98%
rename from common/test/common_tests/test_types_file.cljc
rename to common/test/common_tests/types_file_test.cljc
index a5e0017abe..d4af3db5b6 100644
--- a/common/test/common_tests/test_types_file.cljc
+++ b/common/test/common_tests/types_file_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-types-file
+(ns common-tests.types-file-test
   (:require
    [app.common.data :as d]
    [app.common.geom.point :as gpt]
@@ -21,8 +21,8 @@
    [app.common.uuid :as uuid]
    [clojure.pprint :refer [pprint]]
    [clojure.test :as t]
-   [common-tests.test-helpers.components :as thk]
-   [common-tests.test-helpers.files :as thf]
+   [common-tests.helpers.components :as thk]
+   [common-tests.helpers.files :as thf]
    [cuerdas.core :as str]))
 
 (t/use-fixtures :each thf/reset-idmap!)
diff --git a/common/test/common_tests/test_types_shape_interactions.cljc b/common/test/common_tests/types_shape_interactions_test.cljc
similarity index 99%
rename from common/test/common_tests/test_types_shape_interactions.cljc
rename to common/test/common_tests/types_shape_interactions_test.cljc
index b92f6c725e..da5340dd17 100644
--- a/common/test/common_tests/test_types_shape_interactions.cljc
+++ b/common/test/common_tests/types_shape_interactions_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-types-shape-interactions
+(ns common-tests.types-shape-interactions-test
   (:require
    [app.common.exceptions :as ex]
    [app.common.geom.point :as gpt]
diff --git a/common/test/common_tests/test_types.cljc b/common/test/common_tests/types_test.cljc
similarity index 98%
rename from common/test/common_tests/test_types.cljc
rename to common/test/common_tests/types_test.cljc
index f64828d3ab..99dec9343c 100644
--- a/common/test/common_tests/test_types.cljc
+++ b/common/test/common_tests/types_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-types
+(ns common-tests.types-test
   (:require
    [clojure.spec.alpha :as s]
    [clojure.test :as t]
diff --git a/common/test/common_tests/test_uuid.cljc b/common/test/common_tests/uuid_test.cljc
similarity index 96%
rename from common/test/common_tests/test_uuid.cljc
rename to common/test/common_tests/uuid_test.cljc
index f57c84914a..e52b1f2e8f 100644
--- a/common/test/common_tests/test_uuid.cljc
+++ b/common/test/common_tests/uuid_test.cljc
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.test-uuid
+(ns common-tests.uuid-test
   (:require
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn
index b532672e9b..dd5285eac1 100644
--- a/frontend/shadow-cljs.edn
+++ b/frontend/shadow-cljs.edn
@@ -86,7 +86,7 @@
   {:target :node-test
    :output-to "target/tests.js"
    :output-dir "target/test/"
-   :ns-regexp "^app.*-test$"
+   :ns-regexp "^frontend-tests.*-test$"
    :autorun true
 
    :compiler-options
diff --git a/frontend/test/app/test_helpers/events.cljs b/frontend/test/frontend_tests/helpers/events.cljs
similarity index 87%
rename from frontend/test/app/test_helpers/events.cljs
rename to frontend/test/frontend_tests/helpers/events.cljs
index 82857a30e8..e398e04206 100644
--- a/frontend/test/app/test_helpers/events.cljs
+++ b/frontend/test/frontend_tests/helpers/events.cljs
@@ -1,14 +1,20 @@
-(ns app.test-helpers.events
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.helpers.events
   (:require
-   [app.common.uuid :as uuid]
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.pages :as cp]
    [app.common.pages.helpers :as cph]
+   [app.common.uuid :as uuid]
    [app.main.data.workspace :as dw]
-   [cljs.test :as t :include-macros true]
-   [cljs.pprint :refer [pprint]]
    [beicon.core :as rx]
+   [cljs.pprint :refer [pprint]]
+   [cljs.test :as t :include-macros true]
    [potok.core :as ptk]))
 
 ;; ---- Helpers to manage global events
diff --git a/frontend/test/app/test_helpers/libraries.cljs b/frontend/test/frontend_tests/helpers/libraries.cljs
similarity index 93%
rename from frontend/test/app/test_helpers/libraries.cljs
rename to frontend/test/frontend_tests/helpers/libraries.cljs
index 8a2a2b8fe2..c00776136d 100644
--- a/frontend/test/app/test_helpers/libraries.cljs
+++ b/frontend/test/frontend_tests/helpers/libraries.cljs
@@ -1,12 +1,18 @@
-(ns app.test-helpers.libraries
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.helpers.libraries
   (:require
-   [cljs.test :as t :include-macros true]
-   [cljs.pprint :refer [pprint]]
    [app.common.pages.helpers :as cph]
    [app.common.types.component :as ctk]
    [app.common.types.container :as ctn]
    [app.main.data.workspace.state-helpers :as wsh]
-   [app.test-helpers.pages :as thp]))
+   [cljs.pprint :refer [pprint]]
+   [cljs.test :as t :include-macros true]
+   [frontend-tests.helpers.pages :as thp]))
 
 ;; ---- Helpers to manage libraries and synchronization
 
@@ -150,7 +156,7 @@
     [shapes-inst shapes-main component]))
 
 (defn resolve-component
-  "Get the component with the given id and all its shapes." 
+  "Get the component with the given id and all its shapes."
   [state component-id]
   (let [page        (thp/current-page state)
         libs        (wsh/get-libraries state)
diff --git a/frontend/test/app/test_helpers/pages.cljs b/frontend/test/frontend_tests/helpers/pages.cljs
similarity index 93%
rename from frontend/test/app/test_helpers/pages.cljs
rename to frontend/test/frontend_tests/helpers/pages.cljs
index e66974d019..34e4994d2e 100644
--- a/frontend/test/app/test_helpers/pages.cljs
+++ b/frontend/test/frontend_tests/helpers/pages.cljs
@@ -1,20 +1,26 @@
-(ns app.test-helpers.pages
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.helpers.pages
   (:require
-   [cljs.test :as t :include-macros true]
-   [cljs.pprint :refer [pprint]]
-   [beicon.core :as rx]
-   [potok.core :as ptk]
-   [app.common.uuid :as uuid]
    [app.common.geom.point :as gpt]
    [app.common.geom.shapes :as gsh]
    [app.common.pages :as cp]
    [app.common.pages.helpers :as cph]
    [app.common.types.shape :as cts]
+   [app.common.uuid :as uuid]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.layout :as layout]
    [app.main.data.workspace.libraries-helpers :as dwlh]
-   [app.main.data.workspace.state-helpers :as wsh]))
+   [app.main.data.workspace.state-helpers :as wsh]
+   [beicon.core :as rx]
+   [cljs.pprint :refer [pprint]]
+   [cljs.test :as t :include-macros true]
+   [potok.core :as ptk]))
 
 ;; ---- Helpers to manage pages and objects
 
diff --git a/frontend/test/app/shapes_test.cljs b/frontend/test/frontend_tests/helpers_shapes_test.cljs
similarity index 77%
rename from frontend/test/app/shapes_test.cljs
rename to frontend/test/frontend_tests/helpers_shapes_test.cljs
index cb3564c071..aec0f6a0fa 100644
--- a/frontend/test/app/shapes_test.cljs
+++ b/frontend/test/frontend_tests/helpers_shapes_test.cljs
@@ -1,17 +1,23 @@
-(ns app.shapes-test
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.helpers-shapes-test
   (:require
    [app.common.colors :as clr]
    [app.common.data :as d]
    [app.common.geom.point :as gpt]
    [app.common.pages.helpers :as cph]
    [app.main.data.workspace.libraries :as dwl]
-   [app.test-helpers.events :as the]
-   [app.test-helpers.libraries :as thl]
-   [app.test-helpers.pages :as thp]
    [beicon.core :as rx]
    [cljs.pprint :refer [pprint]]
    [cljs.test :as t :include-macros true]
    [clojure.stacktrace :as stk]
+   [frontend-tests.helpers.events :as the]
+   [frontend-tests.helpers.libraries :as thl]
+   [frontend-tests.helpers.pages :as thp]
    [linked.core :as lks]
    [potok.core :as ptk]))
 
diff --git a/frontend/test/frontend_tests/setup.cljs b/frontend/test/frontend_tests/setup.cljs
new file mode 100644
index 0000000000..8ab8d8a80e
--- /dev/null
+++ b/frontend/test/frontend_tests/setup.cljs
@@ -0,0 +1,22 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.setup
+  (:require
+   [cljs.test :as t :include-macros true]))
+
+#_(enable-console-print!)
+
+(defmethod t/report [:cljs.test/default :end-run-tests]
+  [m]
+  (if (t/successful? m)
+    (set! (.-exitCode js/process) 0)
+    (set! (.-exitCode js/process) 1)))
+
+#_(set! *main-cli-fn*
+      #(t/run-tests 'frontend-tests.test-snap-data
+                    'frontend-tests.test-simple-math
+                    'frontend-tests.test-range-tree))
diff --git a/frontend/test/app/components_sync_test.cljs b/frontend/test/frontend_tests/state_components_sync_test.cljs
similarity index 99%
rename from frontend/test/app/components_sync_test.cljs
rename to frontend/test/frontend_tests/state_components_sync_test.cljs
index 05bf78ea2c..d6c94ce016 100644
--- a/frontend/test/app/components_sync_test.cljs
+++ b/frontend/test/frontend_tests/state_components_sync_test.cljs
@@ -1,4 +1,10 @@
-(ns app.components-sync-test
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.state-components-sync-test
   (:require
     [app.common.colors :as clr]
     [app.common.data :as d]
@@ -7,16 +13,16 @@
     [app.common.types.container :as ctn]
     [app.main.data.workspace :as dw]
     [app.main.data.workspace.changes :as dch]
-    [app.main.data.workspace.shapes :as dwsh]
     [app.main.data.workspace.libraries :as dwl]
     [app.main.data.workspace.libraries-helpers :as dwlh]
+    [app.main.data.workspace.shapes :as dwsh]
     [app.main.data.workspace.state-helpers :as wsh]
-    [app.test-helpers.events :as the]
-    [app.test-helpers.libraries :as thl]
-    [app.test-helpers.pages :as thp]
     [beicon.core :as rx]
     [cljs.pprint :refer [pprint]]
     [cljs.test :as t :include-macros true]
+    [frontend-tests.helpers.events :as the]
+    [frontend-tests.helpers.libraries :as thl]
+    [frontend-tests.helpers.pages :as thp]
     [linked.core :as lks]
     [potok.core :as ptk]))
 
diff --git a/frontend/test/app/components_basic_test.cljs b/frontend/test/frontend_tests/state_components_test.cljs
similarity index 99%
rename from frontend/test/app/components_basic_test.cljs
rename to frontend/test/frontend_tests/state_components_test.cljs
index f419b96468..86a4a56d61 100644
--- a/frontend/test/app/components_basic_test.cljs
+++ b/frontend/test/frontend_tests/state_components_test.cljs
@@ -1,4 +1,4 @@
-(ns app.components-basic-test
+(ns frontend-tests.state-components-test
   (:require
     [app.common.data :as d]
     [app.common.geom.point :as gpt]
@@ -10,13 +10,13 @@
     [app.main.data.workspace.libraries :as dwl]
     [app.main.data.workspace.libraries-helpers :as dwlh]
     [app.main.data.workspace.state-helpers :as wsh]
-    [app.test-helpers.events :as the]
-    [app.test-helpers.libraries :as thl]
-    [app.test-helpers.pages :as thp]
     [beicon.core :as rx]
     [cljs.pprint :refer [pprint]]
     [cljs.test :as t :include-macros true]
     [clojure.stacktrace :as stk]
+    [frontend-tests.helpers.events :as the]
+    [frontend-tests.helpers.libraries :as thl]
+    [frontend-tests.helpers.pages :as thp]
     [linked.core :as lks]
     [potok.core :as ptk]))
 
diff --git a/frontend/test/app/util/range_tree_test.cljs b/frontend/test/frontend_tests/util_range_tree_test.cljs
similarity index 95%
rename from frontend/test/app/util/range_tree_test.cljs
rename to frontend/test/frontend_tests/util_range_tree_test.cljs
index 03aa9bf11b..5f3627f731 100644
--- a/frontend/test/app/util/range_tree_test.cljs
+++ b/frontend/test/frontend_tests/util_range_tree_test.cljs
@@ -1,9 +1,15 @@
-(ns app.util.range-tree-test
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.util-range-tree-test
   (:require
-   [cljs.test :as t :include-macros true]
-   [cljs.pprint :refer [pprint]]
    [app.common.geom.point :as gpt]
-   [app.util.range-tree :as rt]))
+   [app.util.range-tree :as rt]
+   [cljs.pprint :refer [pprint]]
+   [cljs.test :as t :include-macros true]))
 
 (defn check-max-height [tree num-nodes])
 (defn check-sorted [tree])
diff --git a/frontend/test/app/util/simple_math_test.cljs b/frontend/test/frontend_tests/util_simple_math_test.cljs
similarity index 91%
rename from frontend/test/app/util/simple_math_test.cljs
rename to frontend/test/frontend_tests/util_simple_math_test.cljs
index c6538e0040..acd23526ca 100644
--- a/frontend/test/app/util/simple_math_test.cljs
+++ b/frontend/test/frontend_tests/util_simple_math_test.cljs
@@ -1,4 +1,10 @@
-(ns app.util.simple-math-test
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns frontend-tests.util-simple-math-test
   (:require
    [cljs.test :as t :include-macros true]
    [cljs.pprint :refer [pprint]]
diff --git a/frontend/test/app/util/snap_data_test.cljs b/frontend/test/frontend_tests/util_snap_data_test.cljs
similarity index 99%
rename from frontend/test/app/util/snap_data_test.cljs
rename to frontend/test/frontend_tests/util_snap_data_test.cljs
index 2c1c3d2102..1ede8838a0 100644
--- a/frontend/test/app/util/snap_data_test.cljs
+++ b/frontend/test/frontend_tests/util_snap_data_test.cljs
@@ -4,13 +4,13 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.util.snap-data-test
+(ns frontend-tests.util-snap-data-test
   (:require
-   [app.common.uuid :as uuid]
-   [cljs.test :as t :include-macros true]
-   [cljs.pprint :refer [pprint]]
    [app.common.file-builder :as fb]
-   [app.util.snap-data :as sd]))
+   [app.common.uuid :as uuid]
+   [app.util.snap-data :as sd]
+   [cljs.pprint :refer [pprint]]
+   [cljs.test :as t :include-macros true]))
 
 (t/deftest test-create-index
   (t/testing "Create empty data"