fix tests
Merge branch 'unwrap_forms' of git://github.com/plone/plone.login into unwrap_forms