diff --git a/tests/data/pyside/app.cgx b/tests/data/pyside/app.cgx
index c8b2318..101aa76 100644
--- a/tests/data/pyside/app.cgx
+++ b/tests/data/pyside/app.cgx
@@ -1,79 +1,77 @@
-<template>
-  <window unified-title-and-tool-bar-on-mac >
-    <menubar>
-      <menu title="File">
-        <action
-          v-for="toggle in ['dock', 'dock_content', 'dock_title', 'toolbar', 'action', 'statusbar']"
-          :text="f'Toggle {toggle}'"
-          :object-name="f'toggle_{toggle}'"
-          @triggered="partial(lambda toggle: toggle_item(toggle), toggle=toggle)"
-        />
-        <action separator />
-        <action
-          text="&Quit"
-          @triggered="quit"
-          :role="QtGui.QAction.QuitRole"
-        />
-      </menu>
-    </menubar>
-    <widget>
-      <label text="Main widget" />
-      <button @clicked="button_clicked" />
-      <qcombobox
-        :items="['foo', 'bar']"
-        @activated="on_combobox_changed"
+<window unified-title-and-tool-bar-on-mac >
+  <menubar>
+    <menu title="File">
+      <action
+        v-for="toggle in ['dock', 'dock_content', 'dock_title', 'toolbar', 'action', 'statusbar']"
+        :text="f'Toggle {toggle}'"
+        :object-name="f'toggle_{toggle}'"
+        @triggered="partial(lambda toggle: toggle_item(toggle), toggle=toggle)()"
       />
-    </widget>
-    <dock
-      v-if="toggles['show_dock']"
-      :area="docks['dock']"
-      object-name="dock"
-      @dock-location-changed="on_dock_location_changed"
-    >
-      <widget
-        v-if="toggles['show_dock_title']"
-        object-name="dock_title"
-        title
-      >
-        <label text="Title" />
-      </widget>
-      <widget
-        v-if="toggles['show_dock_content']"
-        object-name="dock_content"
-      >
-        <treeview>
-          <itemmodel :horizontal-header-labels="['Foo', 'Bar']">
-            <standarditem
-              v-for="item in standard_items"
-              v-bind="item"
-            />
-          </itemmodel>
-        </treeview>
-      </widget>
-    </dock>
-    <dock :area="QtCore.Qt.RightDockWidgetArea">
-      <widget>
-        <label text="other" />
-      </widget>
-    </dock>
-    <toolbar
-      v-if="toggles['show_toolbar']"
-      object-name="toolbar"
-    >
+      <action separator />
       <action
-        v-if="toggles['show_action']"
-        text="New"
-        object-name="action"
-        @triggered="on_new"
+        text="&Quit"
+        @triggered="quit"
+        :role="QtGui.QAction.QuitRole"
       />
-    </toolbar>
-    <statusbar
-      v-if="toggles['show_statusbar']"
-      object-name="statusbar"
-      :text="'Hello there', 2000"
+    </menu>
+  </menubar>
+  <widget>
+    <label text="Main widget" />
+    <button @clicked="button_clicked" />
+    <qcombobox
+      :items="['foo', 'bar']"
+      @activated="on_combobox_changed"
+    />
+  </widget>
+  <dock
+    v-if="toggles['show_dock']"
+    :area="docks['dock']"
+    object-name="dock"
+    @dock-location-changed="on_dock_location_changed"
+  >
+    <widget
+      v-if="toggles['show_dock_title']"
+      object-name="dock_title"
+      title
+    >
+      <label text="Title" />
+    </widget>
+    <widget
+      v-if="toggles['show_dock_content']"
+      object-name="dock_content"
+    >
+      <treeview>
+        <itemmodel :horizontal-header-labels="['Foo', 'Bar']">
+          <standarditem
+            v-for="item in standard_items"
+            v-bind="item"
+          />
+        </itemmodel>
+      </treeview>
+    </widget>
+  </dock>
+  <dock :area="QtCore.Qt.RightDockWidgetArea">
+    <widget>
+      <label text="other" />
+    </widget>
+  </dock>
+  <toolbar
+    v-if="toggles['show_toolbar']"
+    object-name="toolbar"
+  >
+    <action
+      v-if="toggles['show_action']"
+      text="New"
+      object-name="action"
+      @triggered="on_new"
     />
-  </window>
-</template>
+  </toolbar>
+  <statusbar
+    v-if="toggles['show_statusbar']"
+    object-name="statusbar"
+    :text="'Hello there', 2000"
+  />
+</window>
 
 <script>
 from functools import partial
diff --git a/tests_legacy/data/simple.cgx b/tests/data/simple.cgx
similarity index 100%
rename from tests_legacy/data/simple.cgx
rename to tests/data/simple.cgx
diff --git a/tests/pyside/conftest.py b/tests/pyside/conftest.py
new file mode 100644
index 0000000..11449b7
--- /dev/null
+++ b/tests/pyside/conftest.py
@@ -0,0 +1,39 @@
+import pytest
+
+
+@pytest.fixture(scope="function", autouse=True)
+def qapp(qapp_args, qapp_cls, pytestconfig, qtbot):
+    # workaround for https://bugreports.qt.io/browse/PYSIDE-2575
+    import asyncio
+
+    from PySide6 import QtCore
+    from PySide6.QtAsyncio import QAsyncioEventLoopPolicy
+    from PySide6.QtWidgets import QMainWindow
+    from pytestqt.qt_compat import qt_api
+
+    app = qt_api.QtWidgets.QApplication.instance()
+    if app is None:
+        assert False
+        app = qapp_cls(qapp_args)
+        name = pytestconfig.getini("qt_qapp_name")
+        app.setApplicationName(name)
+    else:
+        # Check that there are not left-over widgets from other tests
+        assert len(app.topLevelWidgets()) == 0
+
+    policy = asyncio.get_event_loop_policy()
+    if not isinstance(policy, QAsyncioEventLoopPolicy):
+        asyncio.set_event_loop_policy(QAsyncioEventLoopPolicy())
+
+    yield app
+
+    for widget in app.topLevelWidgets():
+        if isinstance(widget, QMainWindow):
+            widget.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
+        widget.close()
+        widget.deleteLater()
+
+    # Process events to make sure that widgets will be cleaned up
+    app.processEvents()
+
+    qtbot.waitUntil(lambda: len(app.topLevelWidgets()) == 0, timeout=500)
diff --git a/tests/pyside/lists.cgx b/tests/pyside/lists.cgx
new file mode 100644
index 0000000..cfc7a73
--- /dev/null
+++ b/tests/pyside/lists.cgx
@@ -0,0 +1,75 @@
+<window>
+  <widget>
+    <qsplitter>
+
+      <component
+        v-for="view in ['qlistview', 'qtableview', 'qtreeview']"
+        :is="view"
+      >
+        <qstandarditemmodel :column_count="2">
+          <qstandarditem
+            v-for="content in items_content()"
+
+            :text="content['text']"
+            :model_index="content['model_index']"
+          />
+
+            <!-- v-bind="content" -->
+        </qstandarditemmodel>
+      </component>
+
+      <!-- <qlistview>
+        <qstandarditemmodel :column_count="2">
+          <qstandarditem
+            v-for="content in items_content()"
+            v-bind="content"
+          />
+        </qstandarditemmodel>
+      </qlistview>
+      <qtableview>
+        <qstandarditemmodel :column_count="2">
+          <qstandarditem
+            v-for="content in items_content()"
+            v-bind="content"
+          />
+        </qstandarditemmodel>
+      </qtableview>
+      <qtreeview>
+        <qstandarditemmodel :column_count="2">
+          <qstandarditem
+            v-for="content in items_content()"
+            v-bind="content"
+          />
+        </qstandarditemmodel>
+      </qtreeview> -->
+    </qsplitter>
+    <widget :layout="{'type': 'box', 'direction': 'LeftToRight'}" :maximum-height="50">
+      <button text="Add" @clicked="add_item" object-name="add" />
+      <button text="Remove" @clicked="remove_item" object-name="remove" />
+    </widget>
+  </widget>
+</window>
+
+<script>
+import collagraph as cg
+from observ import to_raw
+
+class ListsExample(cg.Component):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.state["values"] = to_raw(self.props["items"])
+
+    def items_content(self):
+        return [
+            {"text": text, "model_index": (row, column)}
+            for row, (item, _) in enumerate(self.state["values"])
+            for column, text in enumerate(item)
+        ]
+
+    def add_item(self):
+        self.state["values"].append([["NEW", "ITEM"], False])
+
+    def remove_item(self):
+        if len(self.state["values"]):
+            self.state["values"].pop(0)
+</script>
diff --git a/tests/pyside/test_pyside_elements.py b/tests/pyside/test_pyside_elements.py
index 7b14c69..011ea59 100644
--- a/tests/pyside/test_pyside_elements.py
+++ b/tests/pyside/test_pyside_elements.py
@@ -1,4 +1,3 @@
-import textwrap
 from functools import partial
 
 import pytest
@@ -8,10 +7,7 @@
 
 from PySide6 import QtCore, QtGui, QtWidgets
 
-from collagraph import Collagraph
-from collagraph import create_element as h
-from collagraph.cgx.cgx import load_from_string
-from collagraph.renderers import PySideRenderer
+import collagraph as cg
 
 
 def get_current_window(app):
@@ -25,16 +21,24 @@ def get_current_window(app):
     return windows[0] if windows else None
 
 
-def test_simple_structure(qtbot):
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
+def test_simple_structure(qtbot, parse_source):
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
 
     container = renderer.create_element("Window")
 
-    def Simple(props):
-        return h("Widget", {"object_name": "simple"})
+    Simple, _ = parse_source(
+        """
+        <widget object_name="simple" />
+        <script>
+        import collagraph as cg
+        class Simple(cg.Component):
+            pass
+        </script>
+        """
+    )
 
-    gui.render(h(Simple, {}), container)
+    gui.render(Simple, container)
 
     def check_simple_is_child():
         simple = container.findChild(QtWidgets.QWidget, name="simple")
@@ -44,92 +48,92 @@ def check_simple_is_child():
     qtbot.waitUntil(check_simple_is_child, timeout=500)
 
 
-def test_layouts(qapp, qtbot):
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
-
-    def LayoutExample(props):
-        # Data to fill the box layout
-        box = []
-        for i in range(1, 5):
-            box.append(("Button", {"text": f"Button {i}"}))
-
-        # Data to fill the grid layout
-        grid = []
-        for i in range(1, 5):
-            grid.append(("Label", {"text": f"Line {i}", "grid_index": (i, 0)}))
-            grid.append(("LineEdit", {"grid_index": (i, 1)}))
-        grid.append(
-            (
-                "TextEdit",
-                {
-                    "text": "This widget takes up about two thirds of the grid layout",
-                    "grid_index": (1, 2, 4, 1),
-                },
-            )
-        )
-
-        # Data to fill the form layout
-        form = []
-        for i, widget in enumerate(["LineEdit", "ComboBox", "SpinBox"]):
-            text = f"Line {i+1}:"
-            if i == 1:
-                text = "Line 2, long text:"
-            form.append((widget, {"form_label": text, "form_index": i}))
-
-        return h(
-            "Window",
-            {},
-            h(
-                "Widget",
-                {},
-                h(
-                    "GroupBox",
-                    {
-                        "title": "Horizontal layout",
-                        "object_name": "box",
-                        "layout": {
-                            "type": "Box",
-                            "direction": "LeftToRight",
+def test_layouts(qapp, qtbot, parse_source):
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
+
+    LayoutExample, _ = parse_source(
+        """
+        <window>
+          <widget>
+            <groupbox
+              title="Horizontal layout"
+              object_name="box"
+              :layout="{'type': 'box', 'direction': 'LeftToRight'}"
+            >
+              <component
+                v-for="tag, attrs in box"
+                :is="tag"
+                v-bind="attrs"
+              />
+            </groupbox>
+            <groupbox
+              title="Grid layout"
+              object_name="grid"
+              :layout="{'type': 'grid'}"
+            >
+              <component
+                v-for="tag, attrs in grid"
+                :is="tag"
+                v-bind="attrs"
+              />
+            </groupbox>
+            <groupbox
+              title="Form layout"
+              object_name="form"
+              :layout="{'type': 'form'}"
+            >
+              <component
+                v-for="tag, attrs in form"
+                :is="tag"
+                v-bind="attrs"
+              />
+            </groupbox>
+            <textedit text="This widget takes up all the remaining space in the top-level layout" />
+            <dialogbuttonbox :buttons="('Ok', 'Cancel')">
+              <button text="Custom" role="ActionRole" />
+            </dialogbuttonbox>
+          </widget>
+        </window>
+
+        <script>
+        import collagraph as cg
+
+        class LayoutExample(cg.Component):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+                # Data to fill the box layout
+                self.box = []
+                for i in range(1, 5):
+                    self.box.append(("button", {"text": f"Button {i}"}))
+
+                # Data to fill the grid layout
+                self.grid = []
+                for i in range(1, 5):
+                    self.grid.append(("label", {"text": f"Line {i}", "grid_index": (i, 0)}))
+                    self.grid.append(("lineedit", {"grid_index": (i, 1)}))
+                self.grid.append(
+                    (
+                        "TextEdit",
+                        {
+                            "text": "This widget takes up about two thirds of the grid layout",
+                            "grid_index": (1, 2, 4, 1),
                         },
-                    },
-                    *[h(item[0], item[1]) for item in box],
-                ),
-                h(
-                    "GroupBox",
-                    {
-                        "title": "Grid layout",
-                        "object_name": "grid",
-                        "layout": {"type": "Grid"},
-                    },
-                    *[h(item[0], item[1]) for item in grid],
-                ),
-                h(
-                    "GroupBox",
-                    {
-                        "title": "Form layout",
-                        "object_name": "form",
-                        "layout": {"type": "Form"},
-                    },
-                    *[h(item[0], item[1]) for item in form],
-                ),
-                h(
-                    "TextEdit",
-                    {
-                        "text": "This widget takes up all the remaining "
-                        "space in the top-level layout."
-                    },
-                ),
-                h(
-                    "DialogButtonBox",
-                    {"buttons": ("Ok", "Cancel")},
-                    h("Button", {"text": "Custom", "role": "ActionRole"}),
-                ),
-            ),
-        )
-
-    element = h(LayoutExample, {})
-    gui.render(element, qapp)
+                    )
+                )
+
+                # Data to fill the form layout
+                self.form = []
+                for i, widget in enumerate(["lineedit", "combobox", "spinbox"]):
+                    text = f"Line {i+1}:"
+                    if i == 1:
+                        text = "Line 2, long text:"
+                    self.form.append((widget, {"form_label": text, "form_index": i}))
+        </script>
+        """
+    )
+
+    gui.render(LayoutExample, qapp)
 
     window = None
 
@@ -155,64 +159,70 @@ def check_label():
     qtbot.waitUntil(check_label, timeout=500)
 
 
-def test_lists(qapp, qtbot, qtmodeltester):
-    def ListsExample(props):
-        def add_item():
-            props["items"].append([["NEW", "ITEM"], False])
-
-        def remove_item():
-            if len(props["items"]):
-                props["items"].pop(0)
-
-        children = []
-        for row, (item, _) in enumerate(props["items"]):
-            for column, text in enumerate(item):
-                children.append(
-                    h("QStandardItem", {"text": text, "model_index": (row, column)})
-                )
+def test_lists(qapp, qtbot, qtmodeltester, parse_source):
+    """
+    children = []
+    for row, (item, _) in enumerate(props["items"]):
+        for column, text in enumerate(item):
+            children.append(
+                h("QStandardItem", {"text": text, "model_index": (row, column)})
+            )
 
-        item_model = h("QStandardItemModel", {"column_count": 2}, *children)
-
-        return h(
-            "Window",
-            {},
-            h(
-                "Widget",
-                {},
-                h(
-                    "QSplitter",
-                    {},
-                    h("QListView", {}, item_model),
-                    h("QTableView", {}, item_model),
-                    h("QTreeView", {}, item_model),
-                ),
-                h(
-                    "Widget",
-                    {
-                        "layout": {
-                            "type": "Box",
-                            "direction": "LeftToRight",
-                        },
-                        "maximum-height": 50,
-                    },
-                    h(
-                        "Button",
-                        {"text": "Add", "on_clicked": add_item, "object_name": "add"},
-                    ),
-                    h(
-                        "Button",
-                        {
-                            "text": "Remove",
-                            "on_clicked": remove_item,
-                            "object_name": "remove",
-                        },
-                    ),
-                ),
-            ),
-        )
+    item_model = h("QStandardItemModel", {"column_count": 2}, *children)
+    """
+    ListsExample, _ = parse_source(
+        """
+        <window>
+          <widget>
+            <qsplitter>
+              <component
+                v-for="view in ['qlistview', 'qtableview', 'qtreeview']"
+                :is="view"
+              >
+                <qstandarditemmodel :column_count="2">
+                  <!-- FIXME: v-bind doesn't seem to work for some reason... -->
+                  <qstandarditem
+                    v-for="content in items_content()"
+                    :text="content['text']"
+                    :model_index="content['model_index']"
+                  />
+                </qstandarditemmodel>
+              </component>
+            </qsplitter>
+            <widget :layout="{'type': 'box', 'direction': 'LeftToRight'}" :maximum-height="50">
+              <button text="Add" @clicked="add_item" object-name="add" />
+              <button text="Remove" @clicked="remove_item" object-name="remove" />
+            </widget>
+          </widget>
+        </window>
+
+        <script>
+        import collagraph as cg
+
+        class ListsExample(cg.Component):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+                self.state["values"] = self.props["items"]
+
+            def items_content(self):
+                return [
+                    {"text": text, "model_index": (row, column)}
+                    for row, (item, _) in enumerate(self.state["values"])
+                    for column, text in enumerate(item)
+                ]
+
+            def add_item(self):
+                self.state["values"].append([["NEW", "ITEM"], False])
+
+            def remove_item(self):
+                if len(self.state["values"]):
+                    self.state["values"].pop(0)
+        </script>
+        """
+    )
 
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
 
     state = reactive(
         {
@@ -224,8 +234,7 @@ def remove_item():
 
     assert len(qapp.topLevelWidgets()) == 0
 
-    element = h(ListsExample, state)
-    gui.render(element, qapp)
+    gui.render(ListsExample, qapp, state=state)
 
     window = None
     model = None
@@ -284,32 +293,31 @@ def check_model_does_not_contain_foo():
     qtbot.waitUntil(check_model_does_not_contain_foo, timeout=500)
 
 
-def test_menu(qapp, qtbot):
-    def MenuExample(props):
-        return h(
-            "Window",
-            {},
-            h(
-                "QMenuBar",
-                {},
-                h(
-                    "QMenu",
-                    {"title": "File"},
-                    h(
-                        "QAction",
-                        {"text": "Open"},
-                    ),
-                ),
-            ),
-            h(
-                "Widget",
-                {},
-            ),
-        )
-
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
-    gui.render(h(MenuExample, {}), qapp)
+def test_menu(qapp, qtbot, parse_source):
+    MenuExample, _ = parse_source(
+        """
+        <window>
+          <qmenubar>
+            <qmenu title="File">
+              <qaction text="Open" />
+            </qmenu>
+          </qmenubar>
+          <widget />
+        </window>
+
+        <script>
+        import collagraph as cg
+
+        class MenuExample(cg.Component):
+            pass
+        </script>
+
+        """
+    )
+
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
+    gui.render(MenuExample, qapp)
 
     def check_file_menu():
         windows = [
@@ -324,8 +332,51 @@ def check_file_menu():
     qtbot.waitUntil(check_file_menu, timeout=500)
 
 
-def test_menu_extensively(qapp, qtbot):
-    from tests.data.menubar import MenuBarTest
+@pytest.mark.skip("Segfaults")
+def test_menu_extensively(qapp, qtbot, parse_source):
+    MenuBarTest, _ = parse_source(
+        """
+        <window>
+          <menubar
+            v-if="show_menubar"
+            object_name="menubar"
+          >
+            <menu
+              v-if="show_menu"
+              title="Menu"
+              object_name="menu"
+            >
+              <action
+                v-if="show_item"
+                text="Action"
+                object_name="action"
+              />
+              <menu
+                v-if="show_submenu"
+                title="Sub Menu"
+                object_name="submenu"
+              >
+                <action
+                  v-if="show_subitem"
+                  text="Sub Action"
+                  object_name="subaction"
+                />
+              </menu>
+            </menu>
+          </menubar>
+          <widget />
+        </window>
+
+        <script>
+        import collagraph as cg
+
+
+        class MenuBarTest(cg.Component):
+            pass
+        </script>
+
+        """
+    )
 
     state = reactive(
         {
@@ -336,9 +387,9 @@ def test_menu_extensively(qapp, qtbot):
             "show_subitem": True,
         }
     )
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
-    gui.render(h(MenuBarTest, state), qapp)
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
+    gui.render(MenuBarTest, qapp, state=state)
 
     def check(menubar, menu, item, submenu, subitem):
         windows = [
@@ -367,6 +418,7 @@ def check(menubar, menu, item, submenu, subitem):
 
     state["show_menu"] = False
 
+    # breakpoint()
     check_items = partial(check, True, False, False, False, False)
     qtbot.waitUntil(check_items, timeout=500)
 
@@ -378,11 +430,11 @@ def check(menubar, menu, item, submenu, subitem):
 
 
 def test_app(qapp, qtbot):
-    from tests.data.app import Window
+    from tests.data.pyside.app import Window
 
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
-    gui.render(h(Window), qapp)
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
+    gui.render(Window, qapp)
 
     window = None
 
@@ -407,6 +459,7 @@ def check_name(type, name, show):
         timeout=500,
     )
     dock = window.findChild(QtGui.QAction, "toggle_dock_title")
+    print(dock)
     dock.triggered.emit()
 
     qtbot.waitUntil(
@@ -479,36 +532,32 @@ def check_name(type, name, show):
     )
 
 
-def test_scroll_area(qapp, qtbot):
-    App, _ = load_from_string(
-        textwrap.dedent(
-            """
-            <template>
-              <scrollarea>
-                <label
-                  v-if="label"
-                />
-                <textedit
-                  v-else-if="edit"
-                />
-              </scrollarea>
-            </template>
-
-            <script>
-            import collagraph as cg
-
-            class App(cg.Component):
-                pass
-            </script>
-            """
-        )
+def test_scroll_area(qapp, qtbot, parse_source):
+    App, _ = parse_source(
+        """
+        <scrollarea>
+          <label
+            v-if="label"
+          />
+          <textedit
+            v-else-if="edit"
+          />
+        </scrollarea>
+
+        <script>
+        import collagraph as cg
+
+        class App(cg.Component):
+            pass
+        </script>
+        """
     )
 
     state = reactive({"label": True, "edit": True})
 
-    renderer = PySideRenderer(autoshow=False)
-    gui = Collagraph(renderer=renderer)
-    gui.render(h(App, state), qapp)
+    renderer = cg.PySideRenderer(autoshow=False)
+    gui = cg.Collagraph(renderer=renderer)
+    gui.render(App, qapp, state=state)
 
     scroll_area = None
 
diff --git a/tests/test_events.py b/tests/test_events.py
index a363b99..2b65ff8 100644
--- a/tests/test_events.py
+++ b/tests/test_events.py
@@ -1,8 +1,14 @@
-from collagraph import EventLoopType, Collagraph
+import pytest
+
+from collagraph import Collagraph, EventLoopType
 from collagraph.renderers import DictRenderer
 
 
 def test_reactive_element_with_events(parse_source):
+    """
+    Events can either be method names, or they have to be
+    proper expressions.
+    """
     App, _ = parse_source(
         """
         <count
@@ -51,3 +57,36 @@ def skip(self, amount):
         handler()
 
     assert count["attrs"]["count"] == 4
+
+
+def test_unsupported_syntax(parse_source):
+    """
+    Show unsupported syntax for events.
+    """
+    with pytest.raises(SyntaxError):
+        parse_source(
+            """
+            <node @bump="count += 1" />
+
+            <script>
+            import collagraph as cg
+
+            class Counter(cg.Component):
+                pass
+            </script>
+            """
+        )
+
+    with pytest.raises(SyntaxError):
+        parse_source(
+            """
+            <node @reset="count = 0" />
+
+            <script>
+            import collagraph as cg
+
+            class Counter(cg.Component):
+                pass
+            </script>
+            """
+        )
diff --git a/tests/test_sfc_comments.py b/tests/test_sfc_comments.py
index 3011c1a..ae3e521 100644
--- a/tests/test_sfc_comments.py
+++ b/tests/test_sfc_comments.py
@@ -1,13 +1,13 @@
 import textwrap
 
-from collagraph.cgx import cgx
+from collagraph.sfc import compiler
 
 
 def test_comment_at_root_level():
     # This next call should not fail based
     # on the existence of comments anywhere
     # between the elements
-    cgx.construct_ast(
+    compiler.construct_ast(
         "template",
         textwrap.dedent(
             """
diff --git a/tests/test_sfc_linting_support.py b/tests/test_sfc_linting_support.py
index 675a885..8148187 100644
--- a/tests/test_sfc_linting_support.py
+++ b/tests/test_sfc_linting_support.py
@@ -1,14 +1,13 @@
 import ast
 from pathlib import Path
 
-from collagraph.cgx import cgx
+from collagraph.sfc import compiler
 
-
-DATA_PATH = Path(__file__).parent.parent / "data"
+DATA_PATH = Path(__file__).parent / "data"
 
 
 def test_cgx_construct_ast():
-    tree, name = cgx.construct_ast(DATA_PATH / "simple.cgx")
+    tree, name = compiler.construct_ast(DATA_PATH / "simple.cgx")
 
     assert name == "Simple"
     assert isinstance(tree, ast.Module)