Fixed: simulation calculation
Fixed: CalculatorImplTest