Added more tests to Solve