Merge "Make sure tests know to handle both early creation true and false" into main