Add more calc() tests

Fix #2