Added more Calculator Testing
Modified CalculatorTest