Update TestDropDown and restructure