Cleanup of some gui test stuff