Change test to wait for logout button instead of wait 1 sec
Change MenuItem.fromNameToken to break in loop instead of return