Merge branch 'master' of https://github.com/gabre/calendar-repo
Remove unneeded testcases
Merge branch 'master' of https://github.com/gabre/calendar-repo