Fixed some of the ui-helpers and made the course-team test faster