Cosmetic fixes after parenthesizing

1. Moved Parenthesize() to within class for better encapsulation
2. Restructured testing to allow easier "regression" testing as code
evolves, and added an additional test.