refresh buildout infra
fix tests