Added calc-tests