diff --git a/backend/tests/uxbox/tests/helpers.clj b/backend/tests/uxbox/tests/helpers.clj
index 9447e5386..aac3f6aa0 100644
--- a/backend/tests/uxbox/tests/helpers.clj
+++ b/backend/tests/uxbox/tests/helpers.clj
@@ -5,6 +5,7 @@
    [cuerdas.core :as str]
    [mount.core :as mount]
    [environ.core :refer [env]]
+   [uxbox.common.pages :as cp]
    [uxbox.services.mutations.profile :as profile]
    [uxbox.services.mutations.projects :as projects]
    [uxbox.services.mutations.teams :as teams]
@@ -104,11 +105,7 @@
                              :file-id file-id
                              :name (str "page" i)
                              :ordering i
-                             :data {:version 1
-                                    :shapes []
-                                    :options {}
-                                    :canvas []
-                                    :shapes-by-id {}}}))
+                             :data cp/default-page-data}))
 
 
 (defn create-image-library
diff --git a/backend/tests/uxbox/tests/test_services_files.clj b/backend/tests/uxbox/tests/test_services_files.clj
index 442dbdb8a..856b01a19 100644
--- a/backend/tests/uxbox/tests/test_services_files.clj
+++ b/backend/tests/uxbox/tests/test_services_files.clj
@@ -44,9 +44,11 @@
                   :name "new name"
                   :profile-id (:id prof)}
             out  (th/try-on! (sm/handle data))]
+
         ;; (th/print-result! out)
-        (t/is (nil? (:error out)))
-        (t/is (nil? (:result out)))))
+        (let [result (:result out)]
+          (t/is (= (:id data) (:id result)))
+          (t/is (= (:name data) (:name result))))))
 
     (t/testing "query files"
       (let [data {::sq/type :files
diff --git a/backend/tests/uxbox/tests/test_services_pages.clj b/backend/tests/uxbox/tests/test_services_pages.clj
index 17221f317..56c0a6fe8 100644
--- a/backend/tests/uxbox/tests/test_services_pages.clj
+++ b/backend/tests/uxbox/tests/test_services_pages.clj
@@ -111,12 +111,13 @@
                   :id page-id
                   :revn 0
                   :profile-id (:id prof)
-                  :changes [{:type :add-shape
+                  :changes [{:type :add-obj
+                             :frame-id uuid/zero
                              :id sid
-                             :session-id (uuid/next)
-                             :shape {:id sid
-                                     :name "Rect"
-                                     :type :rect}}]}
+                             :obj {:id sid
+                                   :name "Rect"
+                                   :frame-id uuid/zero
+                                   :type :rect}}]}
 
             out (th/try-on! (sm/handle data))]
 
@@ -128,7 +129,7 @@
           (t/is (= (:id data) (:page-id result)))
           (t/is (vector (:changes result)))
           (t/is (= 1 (count (:changes result))))
-          (t/is (= :add-shape (get-in result [:changes 0 :type]))))))
+          (t/is (= :add-obj (get-in result [:changes 0 :type]))))))
 
     (t/testing "conflict error"
       (let [data {::sm/type :update-page
@@ -165,14 +166,16 @@
                   :id (:id page)
                   :revn 0
                   :profile-id (:id prof)
-                  :changes [{:type :add-shape
+                  :changes [{:type :add-obj
                              :id sid
-                             :session-id (uuid/next)
-                             :shape {:id sid
-                                     :name "Rect"
-                                     :type :rect}}]}
+                             :frame-id uuid/zero
+                             :obj {:id sid
+                                   :name "Rect"
+                                   :frame-id uuid/zero
+                                   :type :rect}}]}
             out1 (th/try-on! (sm/handle data))
-            out2 (th/try-on! (sm/handle data))]
+            out2 (th/try-on! (sm/handle data))
+            ]
 
         ;; (th/print-result! out1)
         ;; (th/print-result! out2)
@@ -184,7 +187,7 @@
         (t/is (= 2 (count (get-in out2 [:result :changes]))))
 
         (t/is (= (:id data) (get-in out1 [:result :page-id])))
-        (t/is (= (:id data) (get-in out2 [:result :page-id])))))
-    ))
+        (t/is (= (:id data) (get-in out2 [:result :page-id])))
+    ))))
 
 
diff --git a/backend/tests/uxbox/tests/test_services_projects.clj b/backend/tests/uxbox/tests/test_services_projects.clj
index 5080c8ebd..475bc2685 100644
--- a/backend/tests/uxbox/tests/test_services_projects.clj
+++ b/backend/tests/uxbox/tests/test_services_projects.clj
@@ -76,5 +76,5 @@
 
         (t/is (nil? (:error out)))
         (let [result (:result out)]
-          (t/is (= 1 (count result))))))
+          (t/is (= 0 (count result))))))
     ))