Update buildout bootstrap and fix a test.

This should hopefully make tests green. Note the change in tests, buildout pulls in setuptools.