Add some new locators + a hacky solution to class load order