Follow plone.api conventions on imports
Fix setup tests