Lots o changes, to support x^2 terms

Added some more tests to help with x^2 handling
Deletions of moved tests