Call dummy variable soln, not x as conflicts with certain problems
add main fn
Regenerate problems using soln as dummy variable in tests