Update CalCalc tests and setup