Minor refactoring in UI-test classes