Fix some test output

solve2 now returns a tuple instead of a list