UI Tests fixed