Added more ui tests