Add test for calendar
Add test for acceptance
Update spec for calendar