Fix Calculation Class Error

Fix Calculation Class Error and add calculation to Tester Class for
calculation