added automated testing for calc