Fixed test setup to match buildout's signature