Calendar now working. Added additional test suites.