Jenkins tests

More fixes to the master/develop mismatched UI. Develop branch tests now seem to get through the UI without any human help.