UI tests improvements