diff --git a/docs/src/tutorials/input_component.md b/docs/src/tutorials/input_component.md
index b0dc4d75..55daf2b2 100644
--- a/docs/src/tutorials/input_component.md
+++ b/docs/src/tutorials/input_component.md
@@ -204,7 +204,7 @@ end
 
 Symbolics.@register_symbolic get_sampled_data(t)
 
-function System(; name)
+function CustomSystem(; name)
     vars = @variables f(t)=0 x(t)=0 dx(t)=0 ddx(t)=0
     pars = @parameters m=10 k=1000 d=1
 
@@ -216,7 +216,7 @@ function System(; name)
     System(eqs, t, vars, pars; name)
 end
 
-@named system = System()
+@named system = CustomSystem()
 sys = mtkcompile(system)
 prob = ODEProblem(sys, [], (0, time[end]))
 
@@ -248,7 +248,7 @@ using ModelingToolkit: t_nounits as t, D_nounits as D
 using ModelingToolkitStandardLibrary.Blocks
 using OrdinaryDiffEq
 
-function System(; name)
+function SampledDataSystem(; name)
     src = SampledData(Float64, name = :src)
 
     vars = @variables f(t)=0 x(t)=0 dx(t)=0 ddx(t)=0
@@ -262,7 +262,7 @@ function System(; name)
     System(eqs, t, vars, pars; systems = [src], name)
 end
 
-@named system = System()
+@named system = SampledDataSystem()
 sys = mtkcompile(system, split = false)
 s = complete(system)
 
diff --git a/test/Electrical/analog.jl b/test/Electrical/analog.jl
index c5658d89..db0c639f 100644
--- a/test/Electrical/analog.jl
+++ b/test/Electrical/analog.jl
@@ -72,7 +72,7 @@ end
                    connect(R2.n, voltage.n, ground.g)]
 
     @named model = System(connections, t,
-        systems = [R0, R1, R2, source, short, voltage, ground]; guesses = [R2.v => 0.0])
+        systems = [R0, R1, R2, source, short, voltage, ground]; guesses = [R2.v => 0.0, R1.v => 0.0])
     sys = mtkcompile(model)
     prob = ODEProblem(sys, [], (0, 2.0))
     sol = solve(prob, Rodas4()) # has no state; does not work with Tsit5
@@ -867,7 +867,7 @@ end
 
     @mtkcompile sys = SimplePNPCircuitSubstrate(V_b = 0.70)
 
-    prob = ODEProblem(sys, [sys.Q1.c.i => 0.0], (0.0, 10.0))
+    prob = ODEProblem(sys, [sys.Q1.c.i => 0.0], (0.0, 10.0); guesses = [sys.Q1.I_sub => 1.0])
     sol = solve(prob)
 
     @test isapprox(