Fixing tests
Merge branch 'fix_buildout' into develop