Update config based on flattened layout
Update test comments based on flattened layout