Updated existing functional test to work with new dropdown menu

AFDP-142
Small tweaks to make functional tests pass

AFDP-142