More refactoring of GUI tests.