Changes in AbstractWidgetTest are not related to this PR. Please remove them from the PR and rebase (this was already fixed in master).