Started adding tests for Solve