Fix broken test due to last changes to Enum display in combo boxes
Fix New Match Xaml