GUI test code cleanup