calc.py testing improvements.