Added calculationEngine and couple of tests