Restructed test menus