REFACTOR: Reduced redundancies in test methods as well as in the MarkupCalculator's main function.