add test for refactored Calculations class