Upgrade bootstrap.py to buildout 2
Added manuel used in tests as test dep
Fixed test