Updates based on test suite results
Replacement for WidgetUIEvents