Fix unittests.
Update to newer buildout.