Fixed some UI tests after previous refactors.