Add most of infrastructure for solver test