fix tests
fix if undefined or null
Merge branch 'master' of git://github.com/plone/mockup