Integration tests added for calculations. Negative test missing. By xconnect