diff --git a/common/src/app/common/types/component.cljc b/common/src/app/common/types/component.cljc
index f511ae3ff..2af68c8d8 100644
--- a/common/src/app/common/types/component.cljc
+++ b/common/src/app/common/types/component.cljc
@@ -10,7 +10,6 @@
    [app.common.schema :as sm]
    [app.common.types.page :as ctp]
    [app.common.types.plugins :as ctpg]
-   [app.common.uuid :as uuid]
    [cuerdas.core :as str]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -236,7 +235,7 @@
 
 (defn group->swap-slot
   [group]
-  (uuid/uuid (subs (name group) 10)))
+  (parse-uuid (subs (name group) 10)))
 
 (defn get-swap-slot
   "If the shape has a :touched group in the form :swap-slot-<uuid>, get the id."
@@ -326,7 +325,7 @@
 (defn valid-touched-group?
   [group]
   (try
-    (or ((all-touched-groups) group)
+    (or (contains? (all-touched-groups) group)
         (and (swap-slot? group)
              (some? (group->swap-slot group))))
     (catch #?(:clj Throwable :cljs :default) _
diff --git a/common/test/common_tests/runner.cljc b/common/test/common_tests/runner.cljc
index 5245578c1..443bce779 100644
--- a/common/test/common_tests/runner.cljc
+++ b/common/test/common_tests/runner.cljc
@@ -40,7 +40,8 @@
    [common-tests.types.shape-decode-encode-test]
    [common-tests.types.tokens-lib-test]
    [common-tests.types.types-component-test]
-   [common-tests.types.types-libraries-test]))
+   [common-tests.types.types-libraries-test]
+   [common-tests.uuid-test]))
 
 #?(:cljs (enable-console-print!))
 
@@ -80,10 +81,11 @@
    'common-tests.svg-path-test
    'common-tests.svg-test
    'common-tests.text-test
+   'common-tests.time-test
    'common-tests.types-modifiers-test
    'common-tests.types-shape-interactions-test
    'common-tests.types.shape-decode-encode-test
+   'common-tests.types.tokens-lib-test
    'common-tests.types.types-component-test
    'common-tests.types.types-libraries-test
-   'common-tests.types.tokens-lib-test
-   'common-tests.time-test))
+   'common-tests.uuid-test))