Tests, Recipes, MenuCalendar generation, More robust modeling