Integrated Sinon to use mocks and refactored the Calculator mapper for better separation of concerns