added easier placeholders to test
added easier placeholders to test
Merge branch 'master' into generic_calendar
Merge branch 'generic_calendar'