StackCalculationVisitor refactoring + test improvement