improve UI tests