#987 Calendar: Update and create new tests.
GH-998 merge with @pazguille