I was able to get all but ~12 tests working locally by upgrading the version of Selenium and geckodriver along with these changes. I'm not sure if the remaining tests are breaking due to the Firefox/Selenium upgrade or something else, but maybe this can be a starting point if someone else wants to pick up the work.