Updated CalCalc.py with test functions