Added more UI tests