Make tools 1d test suite work with new tool submenus