added classes to CALCULATION and a test class