Added calculation tests