Fixed namespace conflict that was causing test failures for calendar.

Fixes #79.