UI tests changes