Adjusting tests as changes have been made to UI