diff --git a/src/analysis/PlutoDependencyExplorer/ExpressionExplorer.jl b/src/analysis/PlutoDependencyExplorer/ExpressionExplorer.jl
index 25f3fd9f6e..8d7e87f00c 100644
--- a/src/analysis/PlutoDependencyExplorer/ExpressionExplorer.jl
+++ b/src/analysis/PlutoDependencyExplorer/ExpressionExplorer.jl
@@ -99,7 +99,7 @@ function macro_has_special_heuristic_inside(; symstate::SymbolsState, expr::Expr
     return PlutoDependencyExplorer.cell_precedence_heuristic(node, code) < PlutoDependencyExplorer.DEFAULT_PRECEDENCE_HEURISTIC
 end
 
-const can_macroexpand_no_bind = Set(Symbol.(["@md_str", "Markdown.@md_str", "@gensym", "Base.@gensym", "@enum", "Base.@enum", "@assert", "Base.@assert", "@cmd"]))
+const can_macroexpand_no_bind = Set(Symbol.(["@md_str", "Markdown.@md_str", "@gensym", "Base.@gensym", "@enum", "Base.@enum", "@assert", "Base.@assert", "@cmd", "Base.@cmd", "@doc", "Base.@doc", "Core.@doc"])) 
 const can_macroexpand = can_macroexpand_no_bind ∪ Set(Symbol.(["@bind", "PlutoRunner.@bind"]))
 
 const plutorunner_id = Base.PkgId(Base.UUID("dc6b355a-2368-4481-ae6d-ae0351418d79"), "PlutoRunner")
diff --git a/test/ExpressionExplorer.jl b/test/ExpressionExplorer.jl
index 7835ba19a7..5409701069 100644
--- a/test/ExpressionExplorer.jl
+++ b/test/ExpressionExplorer.jl
@@ -148,7 +148,7 @@ end
     @test t(:(@gensym a b c), [], [:a, :b, :c], [:gensym], [], [Symbol("@gensym")])
     @test t(:(Base.@gensym a b c), [], [:a, :b, :c], [:gensym], [], [[:Base, Symbol("@gensym")]])
     @test t(:(Base.@kwdef struct A; x = 1; y::Int = two; z end), [], [], [], [], [[:Base, Symbol("@kwdef")]])
-    @test t(quote "asdf" f(x) = x end, [], [], [], [], [Symbol("@doc")])
+    # @test t(quote "asdf" f(x) = x end, [], [], [], [], [Symbol("@doc")])
 
     # @test t(:(@bind a b), [], [], [], [], [Symbol("@bind")])
     # @test t(:(PlutoRunner.@bind a b), [], [], [], [], [[:PlutoRunner, Symbol("@bind")]])
diff --git a/test/MacroAnalysis.jl b/test/MacroAnalysis.jl
index 4c54571674..3d60dd71a7 100644
--- a/test/MacroAnalysis.jl
+++ b/test/MacroAnalysis.jl
@@ -162,6 +162,10 @@ import Memoize: @memoize
         ])
         cell(idx) = notebook.cells[idx]
 
+        temp_topology = Pluto.updated_topology(notebook.topology, notebook, notebook.cells) |> Pluto.static_resolve_topology
+        
+        @test :f ∈ temp_topology.nodes[cell(1)].funcdefs_without_signatures
+        
         update_run!(🍭, notebook, notebook.cells)
 
         @test :f ∈ notebook.topology.nodes[cell(1)].funcdefs_without_signatures