Move test sections out of the menu system and into drop down selects