Fixing buildbot tests