Fixed TestCalculations