fix more varinfo tests

Author: penelopeysm

src/simple_varinfo.jl

@@ -259,13 +259,8 @@ function SimpleVarInfo{T}(vi::NTVarInfo, ::Type{D}) where {T<:Real,D}
 end
 
 function untyped_simple_varinfo(model::Model)
-<<<<<<< HEAD
     varinfo = SimpleVarInfo(OrderedDict{VarName,Any}())
-    return last(evaluate_and_sample!!(model, varinfo))
-=======
-    varinfo = SimpleVarInfo(OrderedDict())
     return last(init!!(model, varinfo))
->>>>>>> bc16e09 (WIP: InitContext)
 end
 
 function typed_simple_varinfo(model::Model)

test/runtests.jl

@@ -60,12 +60,12 @@ include("test_util.jl")
         # include("utils.jl")
         # include("accumulators.jl")
         # include("compiler.jl")
-        include("varnamedvector.jl")
-        include("varinfo.jl")
-        # include("simple_varinfo.jl")
-        # include("model.jl")
-        # include("sampler.jl")
-        # include("distribution_wrappers.jl")
+        # include("varnamedvector.jl")
+        # include("varinfo.jl")
+        include("simple_varinfo.jl")
+        include("model.jl")
+        include("sampler.jl")
+        include("distribution_wrappers.jl")
         # include("logdensityfunction.jl")
         # include("linking.jl")
         # include("serialization.jl")