Add logout hook test; cleanup help menus