Added browser and URL selection to functional tests
Merge remote-tracking branch 'origin/master'