change calc and tests.