More webdriver fixes for 3.2 changes. Most tests working again.