Add String calculator + use Solve rather than Test