[ticket/281] Run calendar tests and extend calendar testing

Fixes #281