Fix tests errors in buildbot

...ed by an opt, faster tests)