Refactoring in TDate and Calculator, Made JBehave scenarios match NavigationSteps