Moved calculation methods to class "Calculations" and adjusted the test
harness for the change.