Fixes buildbot. 

Adds missing imports. fixes smoke test