Updated UI test jobs to work with 4.1 refactored test code