fix in admin menu and rework menu tests