#7415 - Reformatted webdriver creation for test setup to use only one function for the creation of the webdriver

#7415 - Reformatted webdriver creation for test setup to use only one function for the creation of the webdriver #1976