Add a couple more unit tests for calc function