refactored tests, add dynamic code for city and category nav dropdowns