fix make-solution
add test for make-solution