Added solve and cleanup calls to test.jl