fixed solve3 test
fixed some bugs. solve4 still not working correctly