Fixed tests which failed because of UI changes.