Removed double checking in calendarHelper, changed test for duration type
Merge remote-tracking branch 'origin/master'