Fixes to UI tests