Updated tests for newest UI