New tests
Merge remote-tracking branch 'origin/CAL-1' into CAL-1

Conflicts:
	tests/CalendarTest.php