Add calculation tests

Change-Id: I7dbf602bbb811d974b4ef600f3e14b14f1fb3240