diff --git a/lib/surface.ex b/lib/surface.ex
index ea51e382..3983909d 100644
--- a/lib/surface.ex
+++ b/lib/surface.ex
@@ -109,6 +109,7 @@ defmodule Surface do
     indentation = meta[:indentation] || 0
     column = meta[:column] || 1
 
+    debug_annotations? = Module.get_attribute(__CALLER__.module, :__debug_annotations__)
     component_type = Module.get_attribute(__CALLER__.module, :component_type)
 
     string
@@ -120,7 +121,9 @@ defmodule Surface do
     |> Surface.Compiler.to_live_struct(
       debug: Enum.member?(opts, ?d),
       file: __CALLER__.file,
-      line: line
+      line: line,
+      caller: __CALLER__,
+      annotate_content: debug_annotations? && (&Phoenix.LiveView.HTMLEngine.annotate_tagged_content/1)
     )
   end
 
@@ -148,15 +151,12 @@ defmodule Surface do
     if File.exists?(file) do
       name = file |> Path.rootname() |> Path.basename()
 
-      body =
-        file
-        |> File.read!()
-        |> Surface.Compiler.compile(1, __CALLER__, file)
-        |> Surface.Compiler.to_live_struct()
+      quote bind_quoted: [file: file, name: name] do
+        @external_resource file
+        @file file
+
+        body = Surface.__compile_sface__(name, file, __ENV__)
 
-      quote do
-        @external_resource unquote(file)
-        @file unquote(file)
         def unquote(String.to_atom(name))(var!(assigns)) do
           _ = var!(assigns)
           unquote(body)
@@ -172,6 +172,24 @@ defmodule Surface do
     end
   end
 
+  @doc false
+  def __compile_sface__(name, file, env) do
+    debug_annotations? =
+      Module.get_attribute(
+        env.module,
+        :__debug_annotations__,
+        Application.get_env(:phoenix_live_view, :debug_heex_annotations, false)
+      )
+
+    file
+    |> File.read!()
+    |> Surface.Compiler.compile(1, env, file)
+    |> Surface.Compiler.to_live_struct(
+      caller: %Macro.Env{env | file: file, line: 1, function: {String.to_atom(name), 1}},
+      annotate_content: debug_annotations? && (&Phoenix.LiveView.HTMLEngine.annotate_tagged_content/1)
+    )
+  end
+
   @doc """
   Converts the given code into Surface's AST.
 
diff --git a/lib/surface/compiler/eex_engine.ex b/lib/surface/compiler/eex_engine.ex
index 4b21ea8c..9afd2709 100644
--- a/lib/surface/compiler/eex_engine.ex
+++ b/lib/surface/compiler/eex_engine.ex
@@ -7,6 +7,7 @@ defmodule Surface.Compiler.EExEngine do
   for information on this). Finally, it passes these tokens into the engine sequentially in the same
   manner as EEx.Compiler.compile/2
   """
+  alias Surface.Compiler.Helpers
   alias Surface.AST
   alias Surface.IOHelper
   alias Surface.Components.Context
@@ -27,10 +28,12 @@ defmodule Surface.Compiler.EExEngine do
       engine: opts[:engine] || @default_engine,
       depth: 0,
       context_vars: %{count: 0, changed: []},
-      scope: []
+      scope: [],
+      root_tag?: root_tag?(nodes)
     }
 
     nodes
+    |> maybe_annotate_content(opts[:annotate_content], opts[:caller])
     |> to_token_sequence()
     |> generate_buffer(state.engine.init(opts), state)
     |> maybe_print_expression(
@@ -40,6 +43,31 @@ defmodule Surface.Compiler.EExEngine do
     )
   end
 
+  defp maybe_annotate_content(nodes, annotate_content, caller) do
+    if annotate_content do
+      {before_comment, after_comment} = annotate_content.(caller)
+      [%AST.Literal{value: before_comment}] ++ nodes ++ [%AST.Literal{value: after_comment}]
+    else
+      nodes
+    end
+  end
+
+  defp root_tag?(nodes) do
+    Enum.reduce_while(nodes, false, fn
+      %AST.Tag{}, false ->
+        {:cont, true}
+
+      %AST.Tag{}, true ->
+        {:halt, false}
+
+      %AST.Literal{value: value}, acc ->
+        if Helpers.blank?(value), do: {:cont, acc}, else: {:halt, false}
+
+      _node, _acc ->
+        {:halt, false}
+    end)
+  end
+
   defp to_token_sequence(nodes) do
     nodes
     |> to_dynamic_nested_html()
@@ -48,7 +76,7 @@ defmodule Surface.Compiler.EExEngine do
   end
 
   defp generate_buffer([], buffer, state) do
-    ast = state.engine.handle_body(buffer, root: true)
+    ast = state.engine.handle_body(buffer, root: state.root_tag?)
 
     quote do
       require Phoenix.LiveView.TagEngine
diff --git a/lib/surface/component.ex b/lib/surface/component.ex
index cb4f0344..2f5d561d 100644
--- a/lib/surface/component.ex
+++ b/lib/surface/component.ex
@@ -39,7 +39,7 @@ defmodule Surface.Component do
       @before_compile Surface.Renderer
       @before_compile unquote(__MODULE__)
 
-      use Phoenix.Component
+      use Phoenix.Component, unquote(Keyword.drop(opts, [:slot]))
       import Phoenix.Component, except: [slot: 1, slot: 2]
 
       @behaviour unquote(__MODULE__)
diff --git a/lib/surface/components/form.ex b/lib/surface/components/form.ex
index e622b7f8..da75b7bf 100644
--- a/lib/surface/components/form.ex
+++ b/lib/surface/components/form.ex
@@ -99,6 +99,7 @@ defmodule Surface.Components.Form do
     assigns = assign(assigns, opts: opts)
 
     ~F"""
+    <!-- XXX -->
     <.form :let={form} for={@for} action={@action} {...@opts}>
       <#slot {@default, form: form} context_put={__MODULE__, form: form}/>
     </.form>
diff --git a/lib/surface/components/form/error_tag.ex b/lib/surface/components/form/error_tag.ex
index 762dca71..08ae3fae 100644
--- a/lib/surface/components/form/error_tag.ex
+++ b/lib/surface/components/form/error_tag.ex
@@ -103,18 +103,21 @@ defmodule Surface.Components.Form.ErrorTag do
   prop feedback_for, :string
 
   def render(assigns) do
-    translate_error = assigns.translator || translator_from_config() || (&translate_error/1)
-    class = assigns.class || get_config(:default_class)
+    assigns = assign(assigns, :class, assigns.class || get_config(:default_class))
 
     ~F"""
     <span
       :for={error <- Keyword.get_values(@form.errors || [], @field)}
-      class={class}
+      class={@class}
       phx-feedback-for={@feedback_for || input_name(@form, @field)}
-    >{translate_error.(error)}</span>
+    >{translator(assigns.translator).(error)}</span>
     """
   end
 
+  defp translator(translator) do
+    translator || translator_from_config() || (&translate_error/1)
+  end
+
   @doc """
   Translates an error message.
 
diff --git a/lib/surface/renderer.ex b/lib/surface/renderer.ex
index 1cd48646..e3f86841 100644
--- a/lib/surface/renderer.ex
+++ b/lib/surface/renderer.ex
@@ -10,12 +10,20 @@ defmodule Surface.Renderer do
 
     template_ast =
       if File.exists?(template) do
-        env = Map.put(env, :function, {:render, 1})
+        env =
+          env
+          |> Map.put(:function, {:render, 1})
+          |> Map.put(:file, template)
+
+        debug_annotations? = Module.get_attribute(__CALLER__.module, :__debug_annotations__)
 
         template
         |> File.read!()
         |> Surface.Compiler.compile(1, env, template)
-        |> Surface.Compiler.to_live_struct()
+        |> Surface.Compiler.to_live_struct(
+          caller: env,
+          annotate_content: debug_annotations? && (&Phoenix.LiveView.HTMLEngine.annotate_tagged_content/1)
+        )
       else
         nil
       end
diff --git a/lib/surface/type_handler.ex b/lib/surface/type_handler.ex
index e0a598d6..fdd7f9dd 100644
--- a/lib/surface/type_handler.ex
+++ b/lib/surface/type_handler.ex
@@ -177,7 +177,12 @@ defmodule Surface.TypeHandler do
         {:ok, [~S( ), to_string(name)]}
 
       {:ok, val} ->
-        {:ok, Phoenix.HTML.attributes_escape([{name, val}])}
+        attr_value =
+          [{name, val}]
+          |> Phoenix.HTML.attributes_escape()
+          |> Phoenix.HTML.safe_to_string()
+
+        {:ok, attr_value}
 
       {:error, message} ->
         {:error, message}
diff --git a/test/mix/tasks/compile/surface/validate_components_test.exs b/test/mix/tasks/compile/surface/validate_components_test.exs
index 05c2d9c4..e44287c7 100644
--- a/test/mix/tasks/compile/surface/validate_components_test.exs
+++ b/test/mix/tasks/compile/surface/validate_components_test.exs
@@ -222,11 +222,18 @@ defmodule Mix.Tasks.Compile.Surface.ValidateComponentsTest do
     use Surface.Component
 
     prop list, :list, required: true
+    data item, :any
+    data rest, :list
 
     def render(%{list: [item | rest]} = assigns) do
+      assigns =
+        assigns
+        |> assign(:item, item)
+        |> assign(:rest, rest)
+
       ~F"""
-      {item}
-      <Recursive list={rest} />
+      {@item}
+      <Recursive list={@rest} />
       """
     end
 
diff --git a/test/support/debug_annotations.ex b/test/support/debug_annotations.ex
new file mode 100644
index 00000000..452a1a66
--- /dev/null
+++ b/test/support/debug_annotations.ex
@@ -0,0 +1,25 @@
+defmodule Surface.CompilerTest.DebugAnnotations do
+  import Surface.CompilerTest.DebugAnnotationsUtil
+
+  use_component()
+
+  def func_with_tag(assigns) do
+    ~F[<div>func_with_tag</div>]
+  end
+
+  def func_with_only_text(assigns) do
+    ~F[only_text]
+  end
+
+  def func_with_text_and_tag(assigns) do
+    ~F"""
+    text_before<br>text_after
+    """
+  end
+
+  def func_with_multiple_root_tags(assigns) do
+    ~F[<div>text 1</div><div>text 2</div>]
+  end
+
+  embed_sface "debug_annotations.sface"
+end
diff --git a/test/support/debug_annotations.sface b/test/support/debug_annotations.sface
new file mode 100644
index 00000000..7e6601ff
--- /dev/null
+++ b/test/support/debug_annotations.sface
@@ -0,0 +1 @@
+render
\ No newline at end of file
diff --git a/test/support/debug_annotations_util.ex b/test/support/debug_annotations_util.ex
new file mode 100644
index 00000000..29359eb7
--- /dev/null
+++ b/test/support/debug_annotations_util.ex
@@ -0,0 +1,20 @@
+defmodule Surface.CompilerTest.DebugAnnotationsUtil do
+  def debug_heex_annotations_supported? do
+    Application.spec(:phoenix_live_view, :vsn)
+    |> to_string()
+    |> Version.parse!()
+    |> Version.compare("0.20.0") != :lt
+  end
+
+  defmacro use_component() do
+    if __MODULE__.debug_heex_annotations_supported?() do
+      quote do
+        use Surface.Component, debug_heex_annotations: true
+      end
+    else
+      quote do
+        use Surface.Component
+      end
+    end
+  end
+end
diff --git a/test/surface/compiler_test.exs b/test/surface/compiler_test.exs
index a49affb8..b1e80040 100644
--- a/test/surface/compiler_test.exs
+++ b/test/surface/compiler_test.exs
@@ -1,5 +1,9 @@
 defmodule Surface.CompilerTest do
-  use ExUnit.Case
+  use Surface.ConnCase, async: true
+
+  import Surface, only: [sigil_F: 2]
+  import Phoenix.Component, only: [sigil_H: 2]
+  alias Phoenix.LiveView.Rendered
 
   defmodule Macro do
     use Surface.MacroComponent
@@ -93,6 +97,93 @@ defmodule Surface.CompilerTest do
     end
   end
 
+  defp func(assigns) do
+    ~F[hello]
+  end
+
+  describe "set the root field for the %Phoenix.LiveView.Rendered{} struct" do
+    test "set it to `true` if the there's only a single root tag node" do
+      assigns = %{}
+
+      assert %Rendered{root: true} = ~H[<div/>]
+      assert %Rendered{root: true} = ~F[<div/>]
+      assert %Rendered{root: true} = ~H[<div><span>text</span></div>]
+      assert %Rendered{root: true} = ~F[<div><span>text</span></div>]
+      assert %Rendered{root: true} = ~H[<div><.func/></div>]
+      assert %Rendered{root: true} = ~F[<div><.func/></div>]
+      assert %Rendered{root: true} = ~H[<div><%= "text" %></div>]
+      assert %Rendered{root: true} = ~F[<div>{"text"}</div>]
+
+      assert %Rendered{root: true} = ~H[ <div>text</div> ]
+      assert %Rendered{root: true} = ~F[ <div>text</div> ]
+
+      assert %Rendered{root: true} = ~H"""
+             <div>text</div>
+             """
+
+      assert %Rendered{root: true} = ~F"""
+             <div>text</div>
+             """
+    end
+
+    test "set it to `false` if the root tag is translated/wrapped into an expression e.g. using `:for` or `:if`" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<div :if={true}/>]
+      assert %Rendered{root: false} = ~F[<div :if={true}/>]
+      assert %Rendered{root: false} = ~H(<div :for={_ <- []}/>)
+      assert %Rendered{root: false} = ~F(<div :for={_ <- []}/>)
+    end
+
+    test "set it to `false` if it's a text node" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[text]
+      assert %Rendered{root: false} = ~F[text]
+    end
+
+    test "set it to `false` if it's an expression" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<%= "text" %>]
+      assert %Rendered{root: false} = ~F[{"text"}]
+    end
+
+    test "set it to `false` if it's a component" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<.func/>]
+      assert %Rendered{root: false} = ~F[<.func/>]
+    end
+
+    test "set it to `false` if there are multiple nodes" do
+      assigns = %{}
+
+      assert %Rendered{root: false} = ~H[<div/><div/>]
+      assert %Rendered{root: false} = ~F[<div/><div/>]
+
+      assert %Rendered{root: false} = ~H[text<div/>]
+      assert %Rendered{root: false} = ~F[text<div/>]
+
+      assert %Rendered{root: false} = ~H[<div/>text]
+      assert %Rendered{root: false} = ~F[<div/>text]
+
+      assert %Rendered{root: false} = ~H[<div/><%= "text" %>]
+      assert %Rendered{root: false} = ~F[<div/>{"text"}]
+
+      assert %Rendered{root: false} = ~H[<!-- comment --><div/>]
+      assert %Rendered{root: false} = ~F[<!-- comment --><div/>]
+
+      assert %Rendered{root: false} = ~H[<div/><!-- comment -->]
+      assert %Rendered{root: false} = ~F[<div/><!-- comment -->]
+
+      # Private comments are excluded from the AST.
+      # And since they are not available in ~H, we don't assert against it.
+      assert %Rendered{root: true} = ~F[{!-- comment --}<div/>]
+      assert %Rendered{root: true} = ~F[<div/>{!-- comment --}]
+    end
+  end
+
   test "show public comments" do
     code = """
     <br>
@@ -732,6 +823,122 @@ defmodule Surface.CompilerTest do
       end)
     end
   end
+
+  describe "debug annotations" do
+    @describetag skip: not Surface.CompilerTest.DebugAnnotationsUtil.debug_heex_annotations_supported?()
+
+    test "show debug info for components with a single root tag" do
+      import Surface.CompilerTest.DebugAnnotations
+
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <Surface.CompilerTest.DebugAnnotations.func_with_tag/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.func_with_tag> test/support/debug_annotations.ex:7 --><div>func_with_tag</div><!-- </Surface.CompilerTest.DebugAnnotations.func_with_tag> -->
+             </div>
+             """
+    end
+
+    test "show debug info for components with multiple root tags" do
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <Surface.CompilerTest.DebugAnnotations.func_with_multiple_root_tags/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.func_with_multiple_root_tags> test/support/debug_annotations.ex:21 --><div>text 1</div><div>text 2</div><!-- </Surface.CompilerTest.DebugAnnotations.func_with_multiple_root_tags> -->
+             </div>
+             """
+    end
+
+    test "show debug info for components with text only" do
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <Surface.CompilerTest.DebugAnnotations.func_with_only_text/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.func_with_only_text> test/support/debug_annotations.ex:11 -->only_text<!-- </Surface.CompilerTest.DebugAnnotations.func_with_only_text> -->
+             </div>
+             """
+    end
+
+    test "show full namespace if the component is imported" do
+      import Surface.CompilerTest.DebugAnnotations
+
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <.func_with_tag/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.func_with_tag> test/support/debug_annotations.ex:7 --><div>func_with_tag</div><!-- </Surface.CompilerTest.DebugAnnotations.func_with_tag> -->
+             </div>
+             """
+    end
+
+    test "show debug info for module components with a colocated sface file and point to line 1" do
+      alias Surface.CompilerTest.DebugAnnotations
+
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <DebugAnnotations/>
+            <Surface.CompilerTest.DebugAnnotations/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.render> test/support/debug_annotations.sface:1 -->render<!-- </Surface.CompilerTest.DebugAnnotations.render> -->
+               <!-- <Surface.CompilerTest.DebugAnnotations.render> test/support/debug_annotations.sface:1 -->render<!-- </Surface.CompilerTest.DebugAnnotations.render> -->
+             </div>
+             """
+    end
+
+    test "show debug info for component generated by embed_sface/1 and point to line 1" do
+      import Surface.CompilerTest.DebugAnnotations
+
+      html =
+        render_surface do
+          ~F"""
+          <div>
+            <.debug_annotations/>
+          </div>
+          """
+        end
+
+      assert html == """
+             <div>
+               <!-- <Surface.CompilerTest.DebugAnnotations.debug_annotations> test/support/debug_annotations.sface:1 -->render<!-- </Surface.CompilerTest.DebugAnnotations.debug_annotations> -->
+             </div>
+             """
+    end
+  end
 end
 
 defmodule Surface.CompilerSyncTest do
diff --git a/test/surface/component_test.exs b/test/surface/component_test.exs
index f0e2fbc2..756073e5 100644
--- a/test/surface/component_test.exs
+++ b/test/surface/component_test.exs
@@ -144,11 +144,18 @@ defmodule Surface.ComponentTest do
 
     prop list, :list
     prop count, :integer, default: 1
+    data item, :any
+    data rest, :list
 
     def render(%{list: [item | rest]} = assigns) do
+      assigns =
+        assigns
+        |> assign(:item, item)
+        |> assign(:rest, rest)
+
       ~F"""
-      {@count}. {item}
-      <Recursive list={rest} count={@count + 1}/>
+      {@count}. {@item}
+      <Recursive list={@rest} count={@count + 1}/>
       """
     end
 
diff --git a/test/surface/components/context_test.exs b/test/surface/components/context_test.exs
index 103ddeb3..0768b083 100644
--- a/test/surface/components/context_test.exs
+++ b/test/surface/components/context_test.exs
@@ -850,14 +850,20 @@ defmodule Surface.Components.ContextTest do
       prop count, :integer, default: 1
 
       data field, :any
+      data item, :any
+      data rest, :list
 
       def render(%{list: [item | rest]} = assigns) do
-        assigns = Context.copy_assign(assigns, {ContextTest.Outer, :field})
+        assigns =
+          assigns
+          |> Context.copy_assign({ContextTest.Outer, :field})
+          |> assign(:item, item)
+          |> assign(:rest, rest)
 
         ~F"""
-        {@count}. {item} - {@field}
+        {@count}. {@item} - {@field}
         <Context put={ContextTest.Outer, field: "#{@field} #{@count}"}>
-          <Recursive list={rest} count={@count + 1}/>
+          <Recursive list={@rest} count={@count + 1}/>
         </Context>
         """
       end
diff --git a/test/surface/components/dynamic/component_test.exs b/test/surface/components/dynamic/component_test.exs
index 925a9620..a2ad689e 100644
--- a/test/surface/components/dynamic/component_test.exs
+++ b/test/surface/components/dynamic/component_test.exs
@@ -83,10 +83,8 @@ defmodule Surface.Components.Dynamic.ComponentTest do
     use Surface.LiveView
 
     def render(assigns) do
-      module = Stateless
-
       ~F"""
-      <Component module={module} label="My label" class="myclass"/>
+      <Component module={Stateless} label="My label" class="myclass"/>
       """
     end
   end
@@ -95,10 +93,8 @@ defmodule Surface.Components.Dynamic.ComponentTest do
     use Surface.LiveView
 
     def render(assigns) do
-      module = PhoenixFunctionComponent
-
       ~F"""
-      <Component module={module} function={:show} label="My label" class="myclass"/>
+      <Component module={PhoenixFunctionComponent} function={:show} label="My label" class="myclass"/>
       """
     end
   end
@@ -163,10 +159,8 @@ defmodule Surface.Components.Dynamic.ComponentTest do
     use Surface.LiveView
 
     def render(assigns) do
-      module = StatelessWithId
-
       ~F"""
-      <Component module={module} id="my_id" />
+      <Component module={StatelessWithId} id="my_id" />
       """
     end
   end
diff --git a/test/surface/components/dynamic/live_component_test.exs b/test/surface/components/dynamic/live_component_test.exs
index 89688016..755ca94a 100644
--- a/test/surface/components/dynamic/live_component_test.exs
+++ b/test/surface/components/dynamic/live_component_test.exs
@@ -74,10 +74,8 @@ defmodule Surface.Components.Dynamic.LiveComponentTest do
     alias Surface.Components.Dynamic.LiveComponent
 
     def render(assigns) do
-      module = StatefulComponent
-
       ~F"""
-      <LiveComponent module={module} id="comp"/>
+      <LiveComponent module={StatefulComponent} id="comp"/>
       """
     end
 
@@ -90,12 +88,10 @@ defmodule Surface.Components.Dynamic.LiveComponentTest do
     use Surface.LiveView
 
     def render(assigns) do
-      module = StatefulPhoenixLiveComponent
-
       ~F"""
       <LiveComponent
         id="comp"
-        module={module}
+        module={StatefulPhoenixLiveComponent}
         label="My label"
       />
       """
@@ -107,10 +103,8 @@ defmodule Surface.Components.Dynamic.LiveComponentTest do
     alias Surface.Components.Dynamic.LiveComponent
 
     def render(assigns) do
-      module = StatefulComponentWithDefaultSlot
-
       ~F"""
-      <LiveComponent module={module} id="comp" label="my label">
+      <LiveComponent module={StatefulComponentWithDefaultSlot} id="comp" label="my label">
         <span>Inner</span>
       </LiveComponent>
       """
diff --git a/test/surface/components/events_test.exs b/test/surface/components/events_test.exs
index 30e5785a..d0e6c45c 100644
--- a/test/surface/components/events_test.exs
+++ b/test/surface/components/events_test.exs
@@ -8,10 +8,8 @@ defmodule Surface.Components.EventsTest do
     import Surface.Components.Utils, only: [events_to_opts: 1]
 
     def render(assigns) do
-      attrs = events_to_opts(assigns)
-
       ~F"""
-      <div :attrs={attrs} />
+      <div :attrs={events_to_opts(assigns)} />
       """
     end
 
diff --git a/test/surface/components/form/hidden_inputs_test.exs b/test/surface/components/form/hidden_inputs_test.exs
index a3db6bbd..bc6b3462 100644
--- a/test/surface/components/form/hidden_inputs_test.exs
+++ b/test/surface/components/form/hidden_inputs_test.exs
@@ -51,12 +51,10 @@ defmodule Surface.Components.Form.HiddenInputsTest do
   end
 
   test "based on a changeset" do
-    cs = Parent.changeset(%{children: [%{name: "first"}]})
-
     html =
       render_surface do
         ~F"""
-        <Form for={cs} as={:parent} opts={csrf_token: "test"}>
+        <Form for={Parent.changeset(%{children: [%{name: "first"}]})} as={:parent} opts={csrf_token: "test"}>
           <Inputs for={:children} :let={form: f}>
             <HiddenInputs for={f} />
           </Inputs>
diff --git a/test/surface/components/form/inputs_test.exs b/test/surface/components/form/inputs_test.exs
index 0c5985e0..801e37f0 100644
--- a/test/surface/components/form/inputs_test.exs
+++ b/test/surface/components/form/inputs_test.exs
@@ -31,12 +31,10 @@ defmodule Surface.Components.Form.InputsTest do
   end
 
   test "if the index is received as a slot arg" do
-    cs = Parent.changeset(%{children: [%{name: "first"}, %{name: "second"}]})
-
     html =
       render_surface do
         ~F"""
-        <Form for={cs} as={:cs} opts={csrf_token: "test"}>
+        <Form for={Parent.changeset(%{children: [%{name: "first"}, %{name: "second"}]})} as={:cs} opts={csrf_token: "test"}>
           <Inputs for={:children} :let={index: idx}>
             <div>index: <span>{idx}</span></div>
           </Inputs>
diff --git a/test/surface/components/link_test.exs b/test/surface/components/link_test.exs
index 11666721..5ddfc1f6 100644
--- a/test/surface/components/link_test.exs
+++ b/test/surface/components/link_test.exs
@@ -136,15 +136,15 @@ defmodule Surface.Components.LinkTest do
     end
 
     test "link with %URI{}" do
-      url = "https://surface-ui.org/"
+      assigns = %{url: "https://surface-ui.org/"}
 
-      assert render_surface(do: ~F[<Link label="elixir" to={url} />]) ==
-               render_surface(do: ~F[<Link label="elixir" to={URI.parse(url)} />])
+      assert render_surface(do: ~F[<Link label="elixir" to={@url} />]) ==
+               render_surface(do: ~F[<Link label="elixir" to={URI.parse(@url)} />])
 
-      path = "/surface"
+      assigns = %{path: "/surface"}
 
-      assert render_surface(do: ~F[<Link label="elixir" to={path} />]) ==
-               render_surface(do: ~F[<Link label="elixir" to={URI.parse(path)} />])
+      assert render_surface(do: ~F[<Link label="elixir" to={@path} />]) ==
+               render_surface(do: ~F[<Link label="elixir" to={URI.parse(@path)} />])
     end
 
     test "link with put/delete" do
diff --git a/test/surface/components/live_file_input_test.exs b/test/surface/components/live_file_input_test.exs
index 9cf71fb4..62e28db1 100644
--- a/test/surface/components/live_file_input_test.exs
+++ b/test/surface/components/live_file_input_test.exs
@@ -16,7 +16,9 @@ defmodule Surface.Components.LiveFileInputTest do
 
     def render(assigns) do
       ~F"""
+      <div>
         <LiveFileInput upload={@uploads.avatar} class={"test_class", disabled_test: true} opts={"data-test": "test-data", name: "a name?"} values={a: "one", b: :two, c: 3} />
+      </div>
       """
     end
   end
@@ -34,7 +36,9 @@ defmodule Surface.Components.LiveFileInputTest do
 
     def render(assigns) do
       ~F"""
+      <div>
         <LiveFileInput upload={@uploads.avatar} />
+      </div>
       """
     end
   end
diff --git a/test/surface/components/live_patch_test.exs b/test/surface/components/live_patch_test.exs
index 4104c484..9f3fe215 100644
--- a/test/surface/components/live_patch_test.exs
+++ b/test/surface/components/live_patch_test.exs
@@ -28,7 +28,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      assert html =~ actual_content("user", to: "/users/1")
+      assert html == """
+             <a href="/users/1" data-phx-link="patch" data-phx-link-state="push">user</a>
+             """
     end
 
     test "creates a link without label" do
@@ -39,7 +41,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      assert html =~ actual_content(to: "/users/1")
+      assert html == """
+             <a href="/users/1" data-phx-link="patch" data-phx-link-state="push"></a>
+             """
     end
 
     test "creates a link with default slot" do
@@ -50,7 +54,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      assert html =~ actual_content({:safe, "<span>user</span>"}, to: "/users/1")
+      assert html == """
+             <a href="/users/1" data-phx-link="patch" data-phx-link-state="push"><span>user</span></a>
+             """
     end
 
     test "setting the class" do
@@ -61,7 +67,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      assert html =~ actual_content("user", to: "/users/1", class: "link")
+      assert html == """
+             <a href="/users/1" class="link" data-phx-link="patch" data-phx-link-state="push">user</a>
+             """
     end
 
     test "setting multiple classes" do
@@ -72,7 +80,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      assert html =~ actual_content("user", to: "/users/1", class: "link primary")
+      assert html == """
+             <a href="/users/1" class="link primary" data-phx-link="patch" data-phx-link-state="push">user</a>
+             """
     end
 
     test "passing other options" do
@@ -88,14 +98,9 @@ defmodule Surface.Components.LivePatchTest do
           """
         end
 
-      actual =
-        actual_content("user",
-          to: "/users/1",
-          class: "link",
-          method: :delete,
-          data: [confirm: "Really?"],
-          "csrf-token": "token"
-        )
+      actual = """
+      <a href="/users/1" class="link" method="delete" data-confirm="Really?" data-phx-link="patch" data-phx-link-state="push" csrf-token="token">user</a>
+      """
 
       assert attr_map(html) == attr_map(actual)
     end
@@ -106,15 +111,4 @@ defmodule Surface.Components.LivePatchTest do
 
     Map.new(attrs)
   end
-
-  defp actual_content(text, opts) do
-    text
-    |> Phoenix.LiveView.Helpers.live_patch(opts)
-    |> Phoenix.HTML.html_escape()
-    |> Phoenix.HTML.safe_to_string()
-  end
-
-  defp actual_content(opts) do
-    actual_content("", opts)
-  end
 end
diff --git a/test/surface/components/live_redirect_test.exs b/test/surface/components/live_redirect_test.exs
index e6a75658..c84a12ea 100644
--- a/test/surface/components/live_redirect_test.exs
+++ b/test/surface/components/live_redirect_test.exs
@@ -27,7 +27,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    assert html =~ actual_content("user", to: "/users/1")
+    assert html == """
+           <a href="/users/1" data-phx-link="redirect" data-phx-link-state="push">user</a>
+           """
   end
 
   test "creates a link without label" do
@@ -38,7 +40,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    assert html =~ actual_content(to: "/users/1")
+    assert html == """
+           <a href="/users/1" data-phx-link="redirect" data-phx-link-state="push"></a>
+           """
   end
 
   test "creates a link with default slot" do
@@ -49,7 +53,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    assert html =~ actual_content({:safe, "<span>user</span>"}, to: "/users/1")
+    assert html == """
+           <a href="/users/1" data-phx-link="redirect" data-phx-link-state="push"><span>user</span></a>
+           """
   end
 
   test "setting the class" do
@@ -60,7 +66,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    assert html =~ actual_content("user", to: "/users/1", class: "link")
+    assert html == """
+           <a href="/users/1" class="link" data-phx-link="redirect" data-phx-link-state="push">user</a>
+           """
   end
 
   test "setting multiple classes" do
@@ -71,7 +79,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    assert html =~ actual_content("user", to: "/users/1", class: "link primary")
+    assert html == """
+           <a href="/users/1" class="link primary" data-phx-link="redirect" data-phx-link-state="push">user</a>
+           """
   end
 
   test "passing other options" do
@@ -87,14 +97,9 @@ defmodule Surface.Components.LiveRedirectTest do
         """
       end
 
-    actual =
-      actual_content("user",
-        to: "/users/1",
-        class: "link",
-        method: :delete,
-        data: [confirm: "Really?"],
-        "csrf-token": "token"
-      )
+    actual = """
+    <a href="/users/1" class="link" method="delete" data-confirm="Really?" data-phx-link="redirect" data-phx-link-state="push" csrf-token="token">user</a>
+    """
 
     assert attr_map(html) == attr_map(actual)
   end
@@ -104,15 +109,4 @@ defmodule Surface.Components.LiveRedirectTest do
 
     Map.new(attrs)
   end
-
-  defp actual_content(text, opts) do
-    text
-    |> Phoenix.LiveView.Helpers.live_redirect(opts)
-    |> Phoenix.HTML.html_escape()
-    |> Phoenix.HTML.safe_to_string()
-  end
-
-  defp actual_content(opts) do
-    actual_content("", opts)
-  end
 end
diff --git a/test/surface/integrations/html_tag_test.exs b/test/surface/integrations/html_tag_test.exs
index 1003ef4e..b7dc66ab 100644
--- a/test/surface/integrations/html_tag_test.exs
+++ b/test/surface/integrations/html_tag_test.exs
@@ -143,6 +143,19 @@ defmodule HtmlTagTest do
              """
     end
 
+    test "as expression with a literal string, encode HTML entities" do
+      html =
+        render_surface do
+          ~F"""
+          <div title={"> 123"}/>
+          """
+        end
+
+      assert html =~ """
+             <div title="&gt; 123"></div>
+             """
+    end
+
     test "without a value" do
       html =
         render_surface do
@@ -283,10 +296,20 @@ defmodule HtmlTagTest do
              """
     end
 
-    test "as string literal, it's translated directly to static html" do
-      %Rendered{static: static} = eval(~S[<div class="myclass" id={"123"}/>], __ENV__)
+    test "as string literal, translate directly to static html, without encoding" do
+      %Rendered{static: static} = eval(~S{<div class="[&:nth-child(2)]:p-4"></div>}, __ENV__)
+
+      assert static == [~S{<div class="[&:nth-child(2)]:p-4"></div>}]
+    end
+
+    test "as expression with a literal string, translate and encode directly to static html" do
+      code = """
+      <div class={"[&:nth-child(2)]:p-4"}/>\
+      """
+
+      %Rendered{static: static} = eval(code, __ENV__)
 
-      assert static == [~S(<div class="myclass"), "></div>"]
+      assert static == [~S{<div class="[&amp;:nth-child(2)]:p-4"></div>}]
     end
 
     test "css class with keyword list notation" do
diff --git a/test/surface/integrations/slot_test.exs b/test/surface/integrations/slot_test.exs
index a1f74a59..51b17d01 100644
--- a/test/surface/integrations/slot_test.exs
+++ b/test/surface/integrations/slot_test.exs
@@ -264,8 +264,6 @@ defmodule Surface.SlotTest do
     slot col, as: :cols, arg: %{info: :string}, generator_prop: :items
 
     def render(assigns) do
-      info = "Some info from Grid"
-
       ~F"""
       <table>
         <tr>
@@ -275,7 +273,7 @@ defmodule Surface.SlotTest do
         </tr>
         <tr :for={item <- @items}>
           <td :for={col <- @cols}>
-            <#slot {col, info: info} generator_value={item} />
+            <#slot {col, info: "Some info from Grid"} generator_value={item} />
           </td>
         </tr>
       </table>