Improved structure of UI test setup