Updated UI test jobs to work with refactored ui test code