Corrected test case
Updated CalculationCall in the CFG
Corrected errors regarding updated CFG

CalculationCall
Removed unused inject
Corrected validation rules for all calls!