Fix some incorrect calls to locators.
More fixes to has_access switching
Use the latest version of factory_boy