update test and buildout
update test and buildout