Rework the policy form with zcml to make it work in tests