Add new tests
Refactoring StringCalculator