fix buildout
fix test